summaryrefslogtreecommitdiff
path: root/contrib/cirrus/lib.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-10-06 14:12:49 -0400
committerChris Evich <cevich@redhat.com>2020-10-07 15:29:43 -0400
commit5b7c64cc97e8bf912c6ab7492827e2b871cb17d1 (patch)
tree8db2ad1cbf5329d4228f8475a2cc8b64ff613acd /contrib/cirrus/lib.sh
parentae0f65565200df36347513cdb41989ed3f7a2e93 (diff)
downloadpodman-5b7c64cc97e8bf912c6ab7492827e2b871cb17d1.tar.gz
podman-5b7c64cc97e8bf912c6ab7492827e2b871cb17d1.tar.bz2
podman-5b7c64cc97e8bf912c6ab7492827e2b871cb17d1.zip
Cirrus: Fix obtaining a CI VM
Also removed automatic exection of setup_environment.sh since most people using this script are podman developers (not automation/CI folks). If executing the automation scripts is necessary, manual attendance to required variables like `$TEST_FLAVOR` is mandatory. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/lib.sh')
-rw-r--r--contrib/cirrus/lib.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 79d3b338b..e5124d8e4 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -45,6 +45,9 @@ OS_RELEASE_ID="$(source /etc/os-release; echo $ID)"
OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | cut -d '.' -f 1)"
# Combined to ease soe 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}"
# Essential default paths, many are overridden when executing under Cirrus-CI
GOPATH="${GOPATH:-/var/tmp/go}"