From 62b29652e91d7a738e785b19f28b3686dd3b23ac Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 15 Oct 2021 09:10:15 +0000
Subject: [PATCH] modify for centos7

---
 .drone.yml  | 18 +++++++++++------
 Jenkinsfile | 56 ++++++++++++++++++++++++++---------------------------
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index caa5f66d65..d208d27e41 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -70,14 +70,18 @@ steps:
 - name: build
   image: arm64v8/centos:7
   commands:
-  - yum install -y gcc gcc-c++ make cmake git wget
+  - yum install -y epel-release
+  - yum update
+  - yum install -y gcc gcc-c++ make cmake3  wget git 
   - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
   - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
   - export PATH=$PATH:/usr/local/go/bin
+  - ln -s /usr/bin/cmake3 /usr/bin/cmake
+  - go version
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
-  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - cmake3 .. -DCPUTYPE=aarch64 > /dev/null
   - make -j4 
   trigger:
     event:
@@ -241,14 +245,16 @@ steps:
   image: ansible/centos7-ansible
   commands:
   - yum install -y epel-release
-  - yum install -y gcc gcc-c++ make cmake  wget git 
-  - wget https://dl.google.com/go/go1.16.9.linux-arm64.tar.gz
-  - tar -C /usr/local -xzf go1.16.9.linux-arm64.tar.gz
+  - yum update
+  - yum install -y gcc gcc-c++ make cmake3  wget git 
+  - wget https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
+  - tar -C /usr/local -xzf go1.16.9.linux-amd64.tar.gz
   - export PATH=$PATH:/usr/local/go/bin
+  - ln -s /usr/bin/cmake3 /usr/bin/cmake
   - git submodule update --init --recursive
   - mkdir debug
   - cd debug
-  - cmake .. 
+  - cmake3 .. 
   - make -j4 
   trigger:
     event:
diff --git a/Jenkinsfile b/Jenkinsfile
index 7a759eef15..1909f36ea9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -470,35 +470,35 @@ pipeline {
           }
         } 
         
-        stage('build'){
-          agent{label " wintest "}
-          steps {
-            pre_test()
-            script{             
-                while(win_stop == 0){
-                  sleep(1)
-                  }
-              }
-            }
-        }
-        stage('test'){
-          agent{label "win"}
-          steps{
+        // stage('build'){
+        //   agent{label " wintest "}
+        //   steps {
+        //     pre_test()
+        //     script{             
+        //         while(win_stop == 0){
+        //           sleep(1)
+        //           }
+        //       }
+        //     }
+        // }
+        // stage('test'){
+        //   agent{label "win"}
+        //   steps{
             
-            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                pre_test_win()
-                timeout(time: 20, unit: 'MINUTES'){
-                bat'''
-                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-                .\\test-all.bat Wintest
-                '''
-                }
-            }     
-            script{
-              win_stop=1
-            }
-          }
-        }
+        //     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+        //         pre_test_win()
+        //         timeout(time: 20, unit: 'MINUTES'){
+        //         bat'''
+        //         cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+        //         .\\test-all.bat Wintest
+        //         '''
+        //         }
+        //     }     
+        //     script{
+        //       win_stop=1
+        //     }
+        //   }
+        // }
           
                
     }
-- 
GitLab