@@ -225,26 +225,27 @@ lock(resource: "build-${params.STREAM}") {
225
225
}
226
226
227
227
// buildfetch previous build info
228
- stage('BuildFetch') {
229
- if (s3_stream_dir) {
230
- pipeutils.shwrapWithAWSBuildUploadCredentials("""
231
- cosa buildfetch --arch=${basearch} \
232
- --url s3://${s3_stream_dir}/builds \
233
- --aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
234
- """)
235
- if (parent_version != "") {
236
- // also fetch the parent version; this is used by cosa to do the diff
228
+ lock(resource: "build-${params.STREAM}") {
229
+ stage('BuildFetch') {
230
+ if (s3_stream_dir) {
237
231
pipeutils.shwrapWithAWSBuildUploadCredentials("""
238
232
cosa buildfetch --arch=${basearch} \
239
- --build ${parent_version} \
240
233
--url s3://${s3_stream_dir}/builds \
241
234
--aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
242
235
""")
236
+ if (parent_version != "") {
237
+ // also fetch the parent version; this is used by cosa to do the diff
238
+ pipeutils.shwrapWithAWSBuildUploadCredentials("""
239
+ cosa buildfetch --arch=${basearch} \
240
+ --build ${parent_version} \
241
+ --url s3://${s3_stream_dir}/builds \
242
+ --aws-config-file \${AWS_BUILD_UPLOAD_CONFIG}
243
+ """)
244
+ }
243
245
}
244
246
}
245
247
}
246
248
247
-
248
249
def prevBuildID = null
249
250
if (utils.pathExists("builds/latest")) {
250
251
prevBuildID = shwrapCapture("readlink builds/latest")
@@ -259,7 +260,7 @@ lock(resource: "build-${params.STREAM}") {
259
260
shwrap("python3 /usr/lib/coreos-assembler/download-overrides.py")
260
261
overrides_fetch_param = "--with-cosa-overrides"
261
262
}
262
- shwrap("cosa fetch ${overrides_fetch_param} ${strict_build_param}")
263
+ shwrap("cosa fetch ${overrides_fetch_param} ${strict_build_param}")
263
264
}
264
265
265
266
stage('Build OSTree') {
@@ -592,7 +593,7 @@ def run_release_job(buildID) {
592
593
593
594
def buildid_has_work_pending(buildID, arches) {
594
595
def locked = true
595
- // these locks match the ones in the release job
596
+ // these locks match the ones in the release job
596
597
def locks = arches.collect{[resource: "release-${buildID}-${it}"]}
597
598
lock(resource: "release-${params.STREAM}", extra: locks, skipIfLocked: true) {
598
599
// NB: `return` here wouldn't actually return from the function
0 commit comments