From 6942d3275db684b6f606858e467980ff7d53b96c Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 23 Jul 2019 12:25:34 -0400 Subject: Cirrus: Fix missing -n on CentOS Signed-off-by: Chris Evich --- contrib/cirrus/build_vm_images.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/contrib/cirrus/build_vm_images.sh b/contrib/cirrus/build_vm_images.sh index 74b10158c..ad2e49156 100755 --- a/contrib/cirrus/build_vm_images.sh +++ b/contrib/cirrus/build_vm_images.sh @@ -62,17 +62,6 @@ URI="gs://packer-import${POST_MERGE_BUCKET_SUFFIX}/manifest${BUILT_IMAGE_SUFFIX} gsutil cp packer-manifest.json "$URI" # Ensure any background 'gcloud compute images update' processes finish -set +e # need 'wait' exit code to avoid race -while [[ -n "$(jobs)" ]] -do - wait -n - RET=$? - if [[ "$RET" -eq "127" ]] || \ # Avoid TOCTOU race w/ jobs + wait - [[ "$RET" -eq "0" ]] - then - continue - fi - die $RET "Required base-image metadata update failed" -done +wait # CentOS has no -n option :( echo "Finished. A JSON manifest of produced images is available at $URI" -- cgit v1.2.3-54-g00ecf