diff options
| author | Chris Evich <cevich@redhat.com> | 2022-05-02 10:49:19 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2022-05-10 10:49:32 -0400 |
| commit | 2b5778d416e148df68a99a8c48b814eceddcbce8 (patch) | |
| tree | 22619a0e9c1c27e2d68ac5f06113f98a5aa684e1 /contrib/cirrus | |
| parent | abf4f77bc76b456f6f4c2ecbfc4db4dcb2523ee2 (diff) | |
| download | podman-2b5778d416e148df68a99a8c48b814eceddcbce8.tar.gz podman-2b5778d416e148df68a99a8c48b814eceddcbce8.tar.bz2 podman-2b5778d416e148df68a99a8c48b814eceddcbce8.zip | |
Cirrus: Update images + new automation library
Add support for new automation library version w/ `$DEBUG` fix
(ref: containers/automation_images#128) and added definitions
for commonly used Distro/version variables.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/lib.sh | 7 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 349970012..a7f39e7af 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -36,11 +36,6 @@ fi # Managed by setup_environment.sh; holds task-specific definitions. if [[ -r "/etc/ci_environment" ]]; then source /etc/ci_environment; fi -OS_RELEASE_ID="$(source /etc/os-release; echo $ID)" -# GCE image-name compatible string representation of distribution _major_ version -OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | tr -d '.')" -# Combined to ease some usage -OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}" # This is normally set from .cirrus.yml but default is necessary when # running under hack/get_ci_vm.sh since it cannot infer the value. DISTRO_NV="${DISTRO_NV:-$OS_REL_VER}" @@ -261,6 +256,8 @@ remove_packaged_podman_files() { done done + # OS_RELEASE_ID is defined by automation-library + # shellcheck disable=SC2154 if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]] then LISTING_CMD="dpkg-query -L podman" diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 34a276f10..832cb58ab 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -121,6 +121,9 @@ case "$OS_RELEASE_ID" in # CNI networking available. Upgrading from one to the other is # not supported at this time. Support execution of the upgrade # tests in F36 and later, by disabling Netavark and enabling CNI. + # + # OS_RELEASE_VER is defined by automation-library + # shellcheck disable=SC2154 if [[ "$OS_RELEASE_VER" -ge 36 ]] && \ [[ "$TEST_FLAVOR" != "upgrade_test" ]]; then |