diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-01 10:23:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 10:23:17 -0700 |
| commit | 7772350f525bb02316067733587833266382e47a (patch) | |
| tree | 4e1bae60e3d3de31e79ad5fccc505a3c2e73b4eb /contrib/cirrus/build_vm_images.sh | |
| parent | 641dbda92657ef66c594c9265f10acde748635ae (diff) | |
| parent | 91f398db4c92056bc77c1c82fe9a61e2c8739e8d (diff) | |
| download | podman-7772350f525bb02316067733587833266382e47a.tar.gz podman-7772350f525bb02316067733587833266382e47a.tar.bz2 podman-7772350f525bb02316067733587833266382e47a.zip | |
Merge pull request #1603 from cevich/fix_cirrus_image_build
Fix Cirrus/Packer VM image building
Diffstat (limited to 'contrib/cirrus/build_vm_images.sh')
| -rwxr-xr-x | contrib/cirrus/build_vm_images.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/cirrus/build_vm_images.sh b/contrib/cirrus/build_vm_images.sh index 80c689a6c..ffbb2d5d5 100755 --- a/contrib/cirrus/build_vm_images.sh +++ b/contrib/cirrus/build_vm_images.sh @@ -22,9 +22,7 @@ SCRIPT_BASE $SCRIPT_BASE PACKER_BASE $PACKER_BASE " -# TODO: Skip building images if $CIRRUS_BRANCH =~ "master" and -# commit message of $CIRRUS_CHANGE_IN_REPO contains a magic word -# produced by 'commit_and_create_upstream_pr.sh' script (see .cirrus.yml) +require_regex '\*\*\*\s*CIRRUS:\s*REBUILD\s*IMAGES\s*\*\*\*' 'Not re-building VM images' show_env_vars |