mirror of
https://github.com/containers/podman
synced 2024-10-19 16:54:07 +00:00
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>
This commit is contained in:
parent
abf4f77bc7
commit
2b5778d416
|
@ -29,7 +29,7 @@ env:
|
|||
UBUNTU_NAME: "ubuntu-2110"
|
||||
|
||||
# Google-cloud VM Images
|
||||
IMAGE_SUFFIX: "c4955393725038592"
|
||||
IMAGE_SUFFIX: "c6211193021923328"
|
||||
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
|
||||
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -61,7 +61,7 @@ else
|
|||
-e NAME="$USER" \
|
||||
-e SRCDIR=/src \
|
||||
-e GCLOUD_ZONE="$GCLOUD_ZONE" \
|
||||
-e DEBUG="${DEBUG:-0}" \
|
||||
-e A_DEBUG="${A_DEBUG:-0}" \
|
||||
-v $REPO_DIRPATH:/src:O \
|
||||
-v $HOME/.config/gcloud:/root/.config/gcloud:z \
|
||||
-v $HOME/.config/gcloud/ssh:/root/.ssh:z \
|
||||
|
|
Loading…
Reference in a new issue