diff options
| author | Chris Evich <cevich@redhat.com> | 2018-11-08 09:28:48 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2018-11-13 13:30:48 -0500 |
| commit | aa742e9e681d91cf23a7e4e496358cab4d0ececa (patch) | |
| tree | 2489d56b8f01617b88f17bf936b9da3edcd49b8c /contrib | |
| parent | dd42c1dcffde9628285b4a4ee6d92bca01f3436c (diff) | |
| download | podman-aa742e9e681d91cf23a7e4e496358cab4d0ececa.tar.gz podman-aa742e9e681d91cf23a7e4e496358cab4d0ececa.tar.bz2 podman-aa742e9e681d91cf23a7e4e496358cab4d0ececa.zip | |
Cirrus: Reveal magic, parallel system-testing
Previously, several magic strings were in place to affect cirrus-ci
operations. Two were buried within scripts. One to optionally
execute system-tests within a PR. Another to avoid re-building
cache-images upon every merge.
Move these magic strings out into the open, buy locating their
logic up-front in the ``.cirrus.yml`` file. This improves
readability and reduces surprise/astonishment at runtime.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/build_vm_images.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 17 | ||||
| -rwxr-xr-x | contrib/cirrus/optional_system_test.sh | 8 |
3 files changed, 0 insertions, 27 deletions
diff --git a/contrib/cirrus/build_vm_images.sh b/contrib/cirrus/build_vm_images.sh index ffbb2d5d5..c8ff55445 100755 --- a/contrib/cirrus/build_vm_images.sh +++ b/contrib/cirrus/build_vm_images.sh @@ -22,8 +22,6 @@ SCRIPT_BASE $SCRIPT_BASE PACKER_BASE $PACKER_BASE " -require_regex '\*\*\*\s*CIRRUS:\s*REBUILD\s*IMAGES\s*\*\*\*' 'Not re-building VM images' - show_env_vars # Everything here is running on the 'image-builder-image' GCE image diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 4a3efb8ff..6d43c6ea5 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -120,23 +120,6 @@ cdsudo() { sudo --preserve-env=GOPATH --non-interactive bash -c "$CMD" } -# Skip a build if $1 does not match in the PR Title/Description with message $2 -require_regex() { - req_env_var " - CIRRUS_CHANGE_MESSAGE $CIRRUS_CHANGE_MESSAGE - 1 $1 - 2 $2 - " - regex="$1" - msg="$2" - if ! echo "$CIRRUS_CHANGE_MESSAGE" | egrep -q "$regex" - then - echo "***** The PR Title/Description did not match the regular expression: $MAGIC_RE" - echo "***** $msg" - exit 0 - fi -} - # Helper/wrapper script to only show stderr/stdout on non-zero exit install_ooe() { req_env_var "SCRIPT_BASE $SCRIPT_BASE" diff --git a/contrib/cirrus/optional_system_test.sh b/contrib/cirrus/optional_system_test.sh index 705dda5ad..dfe8e8a2c 100755 --- a/contrib/cirrus/optional_system_test.sh +++ b/contrib/cirrus/optional_system_test.sh @@ -3,14 +3,6 @@ set -e source $(dirname $0)/lib.sh -MAGIC_RE='\*\*\*\s*CIRRUS:\s*SYSTEM\s*TEST\s*\*\*\*' -if ! echo "$CIRRUS_CHANGE_MESSAGE" | egrep -q "$MAGIC_RE" -then - echo "Skipping system-testing because PR title or description" - echo "does not match regular expression: $MAGIC_RE" - exit 0 -fi - req_env_var " GOSRC $GOSRC OS_RELEASE_ID $OS_RELEASE_ID |