containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3904 from cevich/fix_img_prune 

Cirrus: imgprune fixes
This commit is contained in:
OpenShift Merge Robot 2019-09-03 06:04:08 -07:00 committed by GitHub
parent 7e238b9e0c 56f11b1016
commit c03949986f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -299,11 +299,9 @@ image_prune_task:
memory: 1 memory: 1
env: env:
# order is significant, Cirrus not always overriding alias values as intended <<: *meta_env_vars
GCPJSON: ENCRYPTED[4c11d8e09c904c30fc70eecb95c73dec0ddf19976f9b981a0f80f3f6599e8f990bcef93c253ac0277f200850d98528e7] GCPJSON: ENCRYPTED[4c11d8e09c904c30fc70eecb95c73dec0ddf19976f9b981a0f80f3f6599e8f990bcef93c253ac0277f200850d98528e7]
GCPNAME: ENCRYPTED[7f54557ba6e5a437f11283a53e71baec9ca546f48a9835538cc54d297f79968eb1337d4596a1025b14f9d1c5723fbd29] GCPNAME: ENCRYPTED[7f54557ba6e5a437f11283a53e71baec9ca546f48a9835538cc54d297f79968eb1337d4596a1025b14f9d1c5723fbd29]
GCPPROJECT: ENCRYPTED[7c80e728e046b1c76147afd156a32c1c57d4a1ac1eab93b7e68e718c61ca8564fc61fef815952b8ae0a64e7034b8fe4f]
<<: *meta_env_vars
timeout_in: 10m timeout_in: 10m

14
contrib/imgprune/entrypoint.sh
View File

@ -6,13 +6,17 @@ source /usr/local/bin/lib_entrypoint.sh
req_env_var GCPJSON GCPNAME GCPPROJECT IMGNAMES req_env_var GCPJSON GCPNAME GCPPROJECT IMGNAMES
BASE_IMAGES="" unset BASE_IMAGES
# When executing under Cirrus-CI, have access to current source # When executing under Cirrus-CI, script have access to current source
if [[ "$CI" == "true" ]] && [[ -r "$CIRRUS_WORKING_DIR/$SCRIPT_BASE" ]] LIB="$CIRRUS_WORKING_DIR/$SCRIPT_BASE/lib.sh"
if [[ "$CI" == "true" ]] && [[ -r "$LIB" ]]
then then
# Avoid importing anything that might conflict # Avoid importing anything that might conflict
eval "$(egrep -sh '^export .+BASE_IMAGE=' < $CIRRUS_WORKING_DIR/$SCRIPT_BASE/lib.sh)" for env in $(sed -ne 's/^[^#]\+_BASE_IMAGE=/img=/p' "$LIB")
BASE_IMAGES="$UBUNTU_BASE_IMAGE $PRIOR_UBUNTU_BASE_IMAGE $FEDORA_BASE_IMAGE $PRIOR_FEDORA_BASE_IMAGE" do
eval $env
BASE_IMAGES="$BASE_IMAGES $img"
done
else else
# metadata labeling may have broken for some reason in the future # 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." echo "Warning: Running outside of Cirrus-CI, very minor-risk of base-image deletion."