diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-03 06:04:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 06:04:08 -0700 |
| commit | c03949986feffd489e6fd41538d6a5bda233e850 (patch) | |
| tree | b64db8aec68c015a290cce2ca059af52692d55dc | |
| parent | 7e238b9e0c650b20f1a325dad14ef94a3e7d1aab (diff) | |
| parent | 56f11b1016f90d73421fa71ee8a726d2d83c9349 (diff) | |
| download | podman-c03949986feffd489e6fd41538d6a5bda233e850.tar.gz podman-c03949986feffd489e6fd41538d6a5bda233e850.tar.bz2 podman-c03949986feffd489e6fd41538d6a5bda233e850.zip | |
Merge pull request #3904 from cevich/fix_img_prune
Cirrus: imgprune fixes
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | contrib/imgprune/entrypoint.sh | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 8d915fbfe..a1838c682 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -299,11 +299,9 @@ image_prune_task: memory: 1 env: - # order is significant, Cirrus not always overriding alias values as intended + <<: *meta_env_vars GCPJSON: ENCRYPTED[4c11d8e09c904c30fc70eecb95c73dec0ddf19976f9b981a0f80f3f6599e8f990bcef93c253ac0277f200850d98528e7] GCPNAME: ENCRYPTED[7f54557ba6e5a437f11283a53e71baec9ca546f48a9835538cc54d297f79968eb1337d4596a1025b14f9d1c5723fbd29] - GCPPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f] - <<: *meta_env_vars timeout_in: 10m diff --git a/contrib/imgprune/entrypoint.sh b/contrib/imgprune/entrypoint.sh index 829e9938e..b0f006332 100755 --- a/contrib/imgprune/entrypoint.sh +++ b/contrib/imgprune/entrypoint.sh @@ -6,13 +6,17 @@ source /usr/local/bin/lib_entrypoint.sh req_env_var GCPJSON GCPNAME GCPPROJECT IMGNAMES -BASE_IMAGES="" -# When executing under Cirrus-CI, have access to current source -if [[ "$CI" == "true" ]] && [[ -r "$CIRRUS_WORKING_DIR/$SCRIPT_BASE" ]] +unset BASE_IMAGES +# When executing under Cirrus-CI, script have access to current source +LIB="$CIRRUS_WORKING_DIR/$SCRIPT_BASE/lib.sh" +if [[ "$CI" == "true" ]] && [[ -r "$LIB" ]] then # Avoid importing anything that might conflict - eval "$(egrep -sh '^export .+BASE_IMAGE=' < $CIRRUS_WORKING_DIR/$SCRIPT_BASE/lib.sh)" - BASE_IMAGES="$UBUNTU_BASE_IMAGE $PRIOR_UBUNTU_BASE_IMAGE $FEDORA_BASE_IMAGE $PRIOR_FEDORA_BASE_IMAGE" + for env in $(sed -ne 's/^[^#]\+_BASE_IMAGE=/img=/p' "$LIB") + do + eval $env + BASE_IMAGES="$BASE_IMAGES $img" + done else # metadata labeling may have broken for some reason in the future echo "Warning: Running outside of Cirrus-CI, very minor-risk of base-image deletion." |