1
1
mirror of https://github.com/containers/udica synced 2024-09-24 10:20:44 +02:00

Cirrus: Update to F32

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2020-05-15 16:17:42 -04:00 committed by Lukas Vrabec
parent d56d6cf957
commit 2e9b9a25cc
2 changed files with 8 additions and 3 deletions

View File

@ -20,9 +20,9 @@ env:
####
# GCE project where images live
IMAGE_PROJECT: "libpod-218412"
_BUILT_IMAGE_SUFFIX: "libpod-5874660151656448"
FEDORA_CACHE_IMAGE_NAME: "fedora-31-${_BUILT_IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-30-${_BUILT_IMAGE_SUFFIX}"
_BUILT_IMAGE_SUFFIX: "libpod-6268069335007232" # From libpod's .cirrus.yml
FEDORA_CACHE_IMAGE_NAME: "fedora-32-${_BUILT_IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-31-${_BUILT_IMAGE_SUFFIX}"
####
#### Command variables to help avoid duplication

View File

@ -9,6 +9,11 @@ export HOME="$(getent passwd $USER | cut -d : -f 6)"
[[ -n "$UID" ]] || export UID=$(getent passwd $USER | cut -d : -f 3)
export GID=$(getent passwd $USER | cut -d : -f 4)
# Automation environment doesn't automatically load under all conditions :(
if [[ -r '/usr/share/automation/environment' ]]; then
source '/usr/share/automation/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 | cut -d '.' -f 1)"