diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-07 10:39:05 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-08-12 12:01:55 -0400 |
| commit | b843804d51ec3fb747670201b6178896d9a4580d (patch) | |
| tree | 82e398fec66a261134a79150b781ce787e008dcf | |
| parent | 5f99703594414039b9e7e1b615687d009f21d7c4 (diff) | |
| download | podman-b843804d51ec3fb747670201b6178896d9a4580d.tar.gz podman-b843804d51ec3fb747670201b6178896d9a4580d.tar.bz2 podman-b843804d51ec3fb747670201b6178896d9a4580d.zip | |
Adjust get_ci_vm.sh for substitution
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | hack/get_ci_vm.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 79c411a09..69e7d0d55 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,7 +28,7 @@ env: TIMESTAMP: "awk --file ${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/timestamp.awk" #### - #### Cache-image names to test with + #### Cache-image names to test with (double-quotes around names are critical) ### _BUILT_IMAGE_SUFFIX: "libpod-5751722641719296" FEDORA_CACHE_IMAGE_NAME: "fedora-30-${_BUILT_IMAGE_SUFFIX}" diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 90e3aea8e..e1588d570 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -68,9 +68,10 @@ delvm() { } image_hints() { + _BIS=$(egrep -m 1 '_BUILT_IMAGE_SUFFIX:[[:space:]+"[[:print:]]+"' "$LIBPODROOT/.cirrus.yml" | cut -d: -f 2 | tr -d '"[:blank:]') egrep '[[:space:]]+[[:alnum:]].+_CACHE_IMAGE_NAME:[[:space:]+"[[:print:]]+"' \ "$LIBPODROOT/.cirrus.yml" | cut -d: -f 2 | tr -d '"[:blank:]' | \ - grep -v 'notready' | sort -u + sed -r -e "s/\\\$[{]_BUILT_IMAGE_SUFFIX[}]/$_BIS/" | sort -u } show_usage() { |