From be31122b549b3cb61c8b61d2027c1273ca80428e Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 29 Jul 2022 09:47:46 -0400
Subject: [PATCH] jobs/build: Add a release lock to the job

We're hitting a subtle issue here where newer x86_64 pipelines are
running (and early uploading their builds.json) before the release
job runs for the previous build. That release job then fails.

This commit adds a new lock to try to prevent newer x86_64 (main)
pipeline jobs from running before the fleet of jobs from the previous
run are complete.
---
 jobs/build.Jenkinsfile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile
index 1bd51a950..5345d1687 100644
--- a/jobs/build.Jenkinsfile
+++ b/jobs/build.Jenkinsfile
@@ -117,7 +117,18 @@ def pod_label = "cosa-${UUID.randomUUID().toString()}"
 echo "Waiting for build-${params.STREAM} lock"
 currentBuild.description = "[${params.STREAM}] Waiting"
 
+// build lock: we don't want multiple concurrent builds for the same
+//             stream. This one goes first to make sure the release
+//             lock isn't attempted to be acquired until the previous
+//             build is done (and the previous build release job has
+//             already been kicked off and release lock taken by it).
+// release lock: we want to block future runs until the release job
+//               for this build (which gets started at the end of this
+//               build) is done. i.e. we don't want new x86_64 runs to
+//               start before the multi-arch jobs and the release job
+//               are done.
 lock(resource: "build-${params.STREAM}") {
+lock(resource: "release-${params.STREAM}") {
     currentBuild.description = "[${params.STREAM}] Running"
 
     podTemplate(cloud: 'openshift', label: pod_label, yaml: pod) {
@@ -746,4 +757,4 @@ lock(resource: "build-${params.STREAM}") {
             }
         }
     }}
-}}
+}}}