jobs/build: lock buildfetch to avoid simultaneous jobs race condition

fixes: #1079
coreos · Feb 26, 2025 · a59eea8 · a59eea8
1 parent b976b70
commit a59eea8
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile
@@ -225,26 +225,27 @@ lock(resource: "build-${params.STREAM}") {
         }
 
         // buildfetch previous build info
-        stage('BuildFetch') {
-            if (s3_stream_dir) {
-                pipeutils.shwrapWithAWSBuildUploadCredentials("""
-                cosa buildfetch --arch=${basearch} \
-                    --url s3://${s3_stream_dir}/builds \
-                    --aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
-                """)
-                if (parent_version != "") {
-                    // also fetch the parent version; this is used by cosa to do the diff
+        lock(resource: "buildfetch") {
+            stage('BuildFetch') {
+                if (s3_stream_dir) {
                     pipeutils.shwrapWithAWSBuildUploadCredentials("""
                     cosa buildfetch --arch=${basearch} \
-                        --build ${parent_version} \
                         --url s3://${s3_stream_dir}/builds \
                         --aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
                     """)
+                    if (parent_version != "") {
+                        // also fetch the parent version; this is used by cosa to do the diff
+                        pipeutils.shwrapWithAWSBuildUploadCredentials("""
+                        cosa buildfetch --arch=${basearch} \
+                            --build ${parent_version} \
+                            --url s3://${s3_stream_dir}/builds \
+                            --aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
+                        """)
+                    }
                 }
             }
         }
 
-
         def prevBuildID = null
         if (utils.pathExists("builds/latest")) {
             prevBuildID = shwrapCapture("readlink builds/latest")
@@ -259,7 +260,7 @@ lock(resource: "build-${params.STREAM}") {
                 shwrap("python3 /usr/lib/coreos-assembler/download-overrides.py")
                 overrides_fetch_param = "--with-cosa-overrides"
             }
-            shwrap("cosa fetch ${overrides_fetch_param} ${strict_build_param}")            
+            shwrap("cosa fetch ${overrides_fetch_param} ${strict_build_param}")
         }
 
         stage('Build OSTree') {
@@ -592,7 +593,7 @@ def run_release_job(buildID) {
 
 def buildid_has_work_pending(buildID, arches) {
     def locked = true
-    // these locks match the ones in the release job 
+    // these locks match the ones in the release job
     def locks = arches.collect{[resource: "release-${buildID}-${it}"]}
     lock(resource: "release-${params.STREAM}", extra: locks, skipIfLocked: true) {
         // NB: `return` here wouldn't actually return from the function