diff options
| author | Chris Evich <cevich@redhat.com> | 2019-07-23 12:25:34 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-07-25 13:51:33 -0400 |
| commit | 6942d3275db684b6f606858e467980ff7d53b96c (patch) | |
| tree | 421ff64e65f959f1117ff3b4992a474f0498f13d | |
| parent | 23722e644ead5de79b2f8dd4e101702b10befe99 (diff) | |
| download | podman-6942d3275db684b6f606858e467980ff7d53b96c.tar.gz podman-6942d3275db684b6f606858e467980ff7d53b96c.tar.bz2 podman-6942d3275db684b6f606858e467980ff7d53b96c.zip | |
Cirrus: Fix missing -n on CentOS
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rwxr-xr-x | contrib/cirrus/build_vm_images.sh | 13 |
1 files changed, 1 insertions, 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" |