diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-09 06:14:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 06:14:17 -0400 |
| commit | 71d675a164ee64111db1a9214673a3498b3aa123 (patch) | |
| tree | 6a047ed67886d28899125717931869ee368eaeea /contrib/cirrus/setup_environment.sh | |
| parent | 2694fb85f46f43973672ed473b887c634819b71d (diff) | |
| parent | 5b7c64cc97e8bf912c6ab7492827e2b871cb17d1 (diff) | |
| download | podman-71d675a164ee64111db1a9214673a3498b3aa123.tar.gz podman-71d675a164ee64111db1a9214673a3498b3aa123.tar.bz2 podman-71d675a164ee64111db1a9214673a3498b3aa123.zip | |
Merge pull request #7944 from cevich/new_get_ci_vm
Cirrus: Fix obtaining a CI VM
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index c064b6840..156c9b7b2 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -67,9 +67,8 @@ case "$CG_FS_TYPE" in *) die_unknown CG_FS_TYPE esac -# Required to be defined by caller: Which distribution are we testing on -# shellcheck disable=SC2154 -case "$DISTRO_NV" in +# Which distribution are we testing on. +case "$OS_RELEASE_ID" in ubuntu*) ;; fedora*) if ((CONTAINER==0)); then # Not yet running inside a container @@ -83,7 +82,7 @@ case "$DISTRO_NV" in setsebool container_manage_cgroup true fi ;; - *) die_unknown DISTRO_NV + *) die_unknown OS_RELEASE_ID esac # Required to be defined by caller: The environment where primary testing happens |