From 522d25c6273b44ca339e970a866dd9fab575a46c Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 17 Dec 2021 14:35:19 +0800 Subject: [PATCH 1/2] build TDengine 3.0 --- Jenkinsfile | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c19a720d49..a237a0f76f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,36 +76,7 @@ def pre_test(){ git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx - ''' - 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 if(env.CHANGE_TARGET == '3.0'){ - sh ''' - cd ${WK} - git checkout 3.0 - ''' - } - else{ - sh ''' - cd ${WK} - git checkout develop - ''' - } - } - sh ''' - cd ${WK} - git pull >/dev/null + git clean -dfx export TZ=Asia/Harbin date @@ -124,7 +95,7 @@ pipeline { options { skipDefaultCheckout() } environment{ WK = '/var/lib/jenkins/workspace/TDinternal' - WKC= '/var/lib/jenkins/workspace/TDinternal/community' + WKC= '/var/lib/jenkins/workspace/TDengine' } stages { stage('pre_build'){ From 2e4f2f266eae2f8af1c1230c9fa4313a68ef622c Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 17 Dec 2021 15:16:25 +0800 Subject: [PATCH 2/2] add a new server --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a237a0f76f..398ce0f869 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -99,7 +99,7 @@ pipeline { } stages { stage('pre_build'){ - agent{label 'master'} + agent{label 'slave3_0'} options { skipDefaultCheckout() } when { changeRequest()