diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-03 07:51:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 07:51:42 -0700 |
| commit | 2ad5f5cc25844d0723116149b42e04ab310269f4 (patch) | |
| tree | 6f569aea9d7922ff8a1d64079b2d96ebc695b062 /contrib/cirrus/setup_environment.sh | |
| parent | ad467ba16e5f78a159c730ea005830cfa075de15 (diff) | |
| parent | 599714d9f2b5d0715a5cda0275fbea64d581bbc6 (diff) | |
| download | podman-2ad5f5cc25844d0723116149b42e04ab310269f4.tar.gz podman-2ad5f5cc25844d0723116149b42e04ab310269f4.tar.bz2 podman-2ad5f5cc25844d0723116149b42e04ab310269f4.zip | |
Merge pull request #2833 from cevich/podman_in_podman
Cirrus: Support special-case modes of testing
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 96d0e1b55..55706954e 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -43,7 +43,6 @@ then "export OS_RELEASE_ID=\"$(os_release_id)\"" \ "export OS_RELEASE_VER=\"$(os_release_ver)\"" \ "export OS_REL_VER=\"$(os_release_id)-$(os_release_ver)\"" \ - "export ROOTLESS_USER=$ROOTLESS_USER" \ "export BUILT_IMAGE_SUFFIX=\"-$CIRRUS_REPO_NAME-${CIRRUS_CHANGE_IN_REPO:0:8}\"" \ "export GOPATH=\"/var/tmp/go\"" \ 'export PATH="$HOME/bin:$GOPATH/bin:/usr/local/bin:$PATH"' \ @@ -75,14 +74,17 @@ then # Reload to incorporate any changes from above source "$SCRIPT_BASE/lib.sh" - if run_rootless - then - setup_rootless - make install.catatonit - go get github.com/onsi/ginkgo/ginkgo - go get github.com/onsi/gomega/... - dnf -y update runc - fi + case "$SPECIALMODE" in + rootless) + X=$(echo "export ROOTLESS_USER='some${RANDOM}dude'" | \ + tee -a "$HOME/$ENVLIB") && eval "$X" && echo "$X" + setup_rootless + ;; + in_podman) # Assumed to be Fedora + dnf install -y podman buildah + $SCRIPT_BASE/setup_container_environment.sh + ;; + esac fi show_env_vars |