chore(tiflash): update CI/CD pipelines (#3219)

update the build script path. Ref #3216 Signed-off-by: wuhuizuo <wuhuizuo@126.com> Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Nov 8, 2024 · e2be0c5 · e2be0c5
1 parent 9a64816
commit e2be0c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/jenkins/pipelines/cd/atom-jobs/build-common.groovy b/jenkins/pipelines/cd/atom-jobs/build-common.groovy
@@ -622,8 +622,19 @@ else
 
     # check if LLVM toolchain is provided
     echo "the new parameter of tiflash debug is : ${params.TIFLASH_DEBUG}"
-    
-    if [[ -d "release-centos7-llvm" && \$(which clang 2>/dev/null) ]]; then
+
+    # add a new condition branch for `release-linux-llvm` folder:
+    if [[ -d "release-linux-llvm" && \$(which clang 2>/dev/null) ]]; then
+        if [[ "${params.TIFLASH_DEBUG}" != 'true' ]]; then
+            echo "start release ..........."
+            NPROC=12 release-linux-llvm/scripts/build-release.sh
+        else
+            echo "start debug ..........."
+            NPROC=12 release-linux-llvm/scripts/build-debug.sh
+        fi
+        mkdir -p ${TARGET}
+        mv release-linux-llvm/tiflash ${TARGET}/tiflash        
+    elif [[ -d "release-centos7-llvm" && \$(which clang 2>/dev/null) ]]; then
         if [[ "${params.TIFLASH_DEBUG}" != 'true' ]]; then
             echo "start release ..........."
             NPROC=12 release-centos7-llvm/scripts/build-release.sh
@@ -827,15 +838,15 @@ def release(product, label) {
     }
     checkoutFinishTimeInMillis = System.currentTimeMillis()
 
-    if (PRODUCT == 'tics') {
-        if (fileExists('release-centos7-llvm/scripts/build-release.sh') && params.OS != "darwin") {
+    if (PRODUCT == 'tics' && params.OS != 'darwin') {
+        if (fileExists('release-linux-llvm/scripts/build-release.sh') || fileExists('release-centos7-llvm/scripts/build-release.sh')) {
             def image_tag_suffix = ""
             if (fileExists(".toolchain.yml")) {
                 def config = readYaml(file: ".toolchain.yml")
                 image_tag_suffix = config.image_tag_suffix
             }
             label = "tiflash-llvm${image_tag_suffix}".replaceAll('\\.', '-')
-        }else if (fileExists('release-centos7/Makefile') && params.OS != "darwin"){
+        } else if (fileExists('release-centos7/Makefile')){
             label = "tiflash"
         }
     }

diff --git a/pipelines/pingcap/tiflash/latest/pull_integration_test.groovy b/pipelines/pingcap/tiflash/latest/pull_integration_test.groovy
@@ -325,8 +325,8 @@ pipeline {
                         script {
                             def generator = "Ninja"
                             def include_flag = ""
-                            def fix_compile_commands = "${WORKSPACE}/tiflash/release-centos7-llvm/scripts/fix_compile_commands.py"
-                            def run_clang_tidy = "${WORKSPACE}/tiflash/release-centos7-llvm/scripts/run-clang-tidy.py"
+                            def fix_compile_commands = "${WORKSPACE}/tiflash/release-linux-llvm/scripts/fix_compile_commands.py"
+                            def run_clang_tidy = "${WORKSPACE}/tiflash/release-linux-llvm/scripts/run-clang-tidy.py"
                             dir("${WORKSPACE}/build") {
                                 sh label: "debug diff files", script: """
                                 cat /tmp/tiflash-diff-files.json

diff --git a/pipelines/pingcap/tiflash/release-8.5/pull_integration_test.groovy b/pipelines/pingcap/tiflash/release-8.5/pull_integration_test.groovy
@@ -325,6 +325,7 @@ pipeline {
                         script {
                             def generator = "Ninja"
                             def include_flag = ""
+                            // TODO: #3217 replace "release-centos7-llvm" to "release-linux-llvm"
                             def fix_compile_commands = "${WORKSPACE}/tiflash/release-centos7-llvm/scripts/fix_compile_commands.py"
                             def run_clang_tidy = "${WORKSPACE}/tiflash/release-centos7-llvm/scripts/run-clang-tidy.py"
                             dir("${WORKSPACE}/build") {