Revert "[clang-3.4-debuginfo-statistics] Fix the LNT submissions run …

…order" (#292) Reverts #291
llvm · Nov 1, 2024 · 311389d · 311389d
1 parent 8f4b2cb
commit 311389d
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/zorg/jenkins/jobs/jobs/clang-3.4-debuginfo-statistics b/zorg/jenkins/jobs/jobs/clang-3.4-debuginfo-statistics
@@ -11,7 +11,7 @@ pipeline {
 
         string(name: 'GIT_SHA', defaultValue: params.GIT_REVISION ?: '*/release/13.x', description: 'Git commit to build.')
 
-        string(name: 'STAGE_1_JOB_NAME', defaultValue: params.STAGE_1_JOB_NAME ?: 'clang-stage1-RA', description: 'Stage 1 job name to download the artifact from.')
+        string(name: 'ARTIFACT', defaultValue: params.ARTIFACT ?: 'clang-stage1-RA/latest', description: 'Clang artifact to use')
 
         string(name: 'BUILD_TYPE', defaultValue: params.BUILD_TYPE ?: 'Release', description: 'Default CMake build type; one of: Release, Debug, ...')
 
@@ -68,19 +68,6 @@ pipeline {
                '''
             }
         }
-        stage('Download Properties File') {
-            environment {
-               PATH="$PATH:/usr/bin:/usr/local/bin"
-            }
-            steps {
-                withCredentials([string(credentialsId: 's3_resource_bucket', variable: 'S3_BUCKET')]) {
-                    sh """
-                        source ./venv/bin/activate
-                        aws s3 cp "{S3_BUCKET}/clangci/${params.STAGE_1_JOB_NAME}/last_good_build.properties" "."
-                    """
-                }
-            }
-        }
         stage('Fetch Artifact') {
             environment {
                PATH="$PATH:/usr/bin:/usr/local/bin"
@@ -89,7 +76,7 @@ pipeline {
                 withCredentials([string(credentialsId: 's3_resource_bucket', variable: 'S3_BUCKET')]) {
                     sh """
                         source ./venv/bin/activate
-                        export $(grep ARTIFACT last_good_build.properties)
+                        echo "ARTIFACT=${params.ARTIFACT}"
                         python llvm-zorg/zorg/jenkins/monorepo_build.py fetch
                         ls $WORKSPACE/host-compiler/lib/clang/
                         VERSION=`ls $WORKSPACE/host-compiler/lib/clang/`
@@ -115,9 +102,21 @@ pipeline {
                     sh '''
                        source ./venv/bin/activate
 
+                       cd src/clang-13
+                       git tag -a -m "First Commit" first_commit 97724f18c79c7cc81ced24239eb5e883bf1398ef || true
+
+                       git_desc=$(git describe --match "first_commit")
+                       export GIT_DISTANCE=$(echo ${git_desc} | cut -f 2 -d "-")
+
+                       sha=$(echo ${git_desc} | cut -f 3 -d "-")
+                       export GIT_SHA=${sha:1}
+
+                       cd -
+
                        set -eux
 
                        $CXX --version
+                       LLVM_REV=${GIT_DISTANCE}
 
                        mkdir -p $HISTORIC_COMPILER-src
                        mkdir -p $HISTORIC_COMPILER-build
@@ -167,11 +166,17 @@ pipeline {
                 sh '''
                     source ./venv/bin/activate
 
-                    export GIT_DISTANCE=$(grep GIT_DISTANCE last_good_build.properties)
+                    cd src/clang-13
+                    git tag -a -m "First Commit" first_commit 97724f18c79c7cc81ced24239eb5e883bf1398ef || true
+
+                    git_desc=$(git describe --match "first_commit")
+                    export GIT_DISTANCE=$(echo ${git_desc} | cut -f 2 -d "-")
+
+                    cd -
 
                     python llvm-zorg/zorg/jenkins/jobs/util/submit-debuginfo-statistics-to-lnt.py
                 '''
             }
         }
     }
-}
+}