Revert "[TD-11752]<CI>different branches use different dir (#8909)"

This reverts commit 520c3216.

Revert "[TD-11752]<CI>different branches use different dir (#8909)"
This reverts commit 520c3216.
201e82fd · Yiqing Liu · GitHub · 52516028 · 201e82fd
显示空白变更内容
内联并排

Showing with 152 addition and 91 deletion

Jenkinsfile Jenkinsfile +152 -91

未找到文件。
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,54 +41,68 @@ def pre_test(){
    killall -9 taosd ||echo "no taosd running"
    killall -9 gdb || echo "no gdb running"
    killall -9 python3.8 || echo "no python program running"
-    cd ${WS}
+    cd ${WKC}
-    rm -rf ${WK}
+    git reset --hard HEAD~10 >/dev/null
    '''
    script {
      if (env.CHANGE_TARGET == 'master') {
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_master
+        git checkout master
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_master TDinternal
        '''
        }
      else if(env.CHANGE_TARGET == '2.0'){
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_2.0
+        git checkout 2.0
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_2.0 TDinternal
        '''
      } 
      else{
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_develop
+        git checkout develop
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_develop TDinternal
        '''
      }
    }
    sh'''
    cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
+    git pull >/dev/null
    git fetch origin +refs/pull/${CHANGE_ID}/merge
    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached 
    git submodule update --init --recursive
+    cd ${WK}
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
        '''
+      } 
+      else{
        sh '''
        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
+    cd ${WK}
+    git pull >/dev/null 
    export TZ=Asia/Harbin
    date
+    git clean -dfx
    mkdir debug
    cd debug
    cmake .. > /dev/null
@@ -102,54 +116,68 @@ def pre_test(){
 def pre_test_noinstall(){
    sh'hostname'
    sh'''
-    cd ${WS}
+    cd ${WKC}
-    rm -rf ${WK}
+    git reset --hard HEAD~10 >/dev/null
    '''
    script {
      if (env.CHANGE_TARGET == 'master') {
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_master
+        git checkout master
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_master TDinternal
        '''
        }
      else if(env.CHANGE_TARGET == '2.0'){
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_20
+        git checkout 2.0
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_20 TDinternal
        '''
      } 
      else{
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_develop
+        git checkout develop
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_develop TDinternal
        '''
      }
    }
    sh'''
    cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
+    git pull >/dev/null
    git fetch origin +refs/pull/${CHANGE_ID}/merge
    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached 
    git submodule update --init --recursive
+    cd ${WK}
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
+        '''
+      } 
+      else{
        sh '''
        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
+    cd ${WK}
+    git pull >/dev/null 
    export TZ=Asia/Harbin
    date
+    git clean -dfx
    mkdir debug
    cd debug
    cmake .. > /dev/null
@@ -160,54 +188,68 @@ def pre_test_noinstall(){
 def pre_test_mac(){
    sh'hostname'
    sh'''
-    cd ${WS}
+    cd ${WKC}
-    rm -rf ${WK}
+    git reset --hard HEAD~10 >/dev/null
    '''
    script {
      if (env.CHANGE_TARGET == 'master') {
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_master
+        git checkout master
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_master TDinternal
        '''
        }
      else if(env.CHANGE_TARGET == '2.0'){
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_20
+        git checkout 2.0
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_20 TDinternal
        '''
      } 
      else{
        sh '''
-        cd ${WS}
+        cd ${WKC}
-        cd TDinternal_develop
+        git checkout develop
-        git pull
-        cd community
-        git pull
-        cd ${WS}
-        cp -fr TDinternal_develop TDinternal
        '''
      }
    }
    sh'''
    cd ${WKC}
+    [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md"
+    git pull >/dev/null
    git fetch origin +refs/pull/${CHANGE_ID}/merge
    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    git ls-files --stage   | grep 160000   | awk '{print $4}'   | xargs git rm --cached
    git submodule update --init --recursive
+    cd ${WK}
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
        '''
+      } 
+      else{
        sh '''
        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
+    cd ${WK}
+    git pull >/dev/null 
    export TZ=Asia/Harbin
    date
+    git clean -dfx
    mkdir debug
    cd debug
    cmake .. > /dev/null
@@ -222,47 +264,67 @@ def pre_test_win(){
    taskkill /f /t /im python.exe
    cd C:\\
    rd /s /Q C:\\TDengine
-    cd C:\\workspace
+    cd C:\\workspace\\TDinternal
-    rd /s /Q C:\\workspace\\TDinternal | echo 1
+    rd /s /Q C:\\workspace\\TDinternal\\debug
+    cd C:\\workspace\\TDinternal\\community
+    git reset --hard HEAD~10 
    '''
    script {
      if (env.CHANGE_TARGET == 'master') {
        bat '''
-        cd C:\\workspace\\TDinternal_master
+        cd C:\\workspace\\TDinternal\\community
-        git pull
+        git checkout master
-        cd C:\\workspace\\TDinternal_master\\community
-        git pull
-        xcopy /e/y/i/f C:\\workspace\\TDinternal_master  C:\\workspace\\TDinternal
        '''
        }
      else if(env.CHANGE_TARGET == '2.0'){
        bat '''
-        cd C:\\workspace\\TDinternal_20
+        cd C:\\workspace\\TDinternal\\community
-        git pull
+        git checkout 2.0
-        cd C:\\workspace\\TDinternal_20\\community
-        git pull
-        xcopy /e/y/i/f  C:\\workspace\\TDinternal_20  C:\\workspace\\TDinternal
        '''
      } 
      else{
        bat '''
-        cd C:\\workspace\\TDinternal_develop
+        cd C:\\workspace\\TDinternal\\community
-        git pull
+        git checkout develop
-        cd C:\\workspace\\TDinternal_develop\\community
-        git pull
-        xcopy /e/y/i/f  C:\\workspace\\TDinternal_develop  C:\\workspace\\TDinternal
        '''
      }
    }
    bat'''
    cd C:\\workspace\\TDinternal\\community
+    git pull 
    git fetch origin +refs/pull/%CHANGE_ID%/merge
    git checkout -qf FETCH_HEAD
+    git clean -dfx
    git submodule update --init --recursive
+    cd C:\\workspace\\TDinternal
+    git reset --hard HEAD~10
    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
        bat '''
        cd C:\\workspace\\TDinternal
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        bat '''
+        cd C:\\workspace\\TDinternal
+        git checkout 2.0
+        '''
+      } 
+      else{
+        bat '''
+        cd C:\\workspace\\TDinternal
+        git checkout develop
+        '''
+      } 
+    }
+    bat '''
+    cd C:\\workspace\\TDinternal
+    git pull 
    date
+    git clean -dfx
    mkdir debug
    cd debug
    call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
@@ -282,7 +344,6 @@ pipeline {
  environment{
      WK = '/var/lib/jenkins/workspace/TDinternal'
      WKC= '/var/lib/jenkins/workspace/TDinternal/community'
-      WS = '/var/lib/jenkins/workspace'
  }
  stages {
      stage('pre_build'){