diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-05 10:35:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 10:35:29 -0700 |
| commit | 550270364bb533f29742534ff31e15cbf54c57da (patch) | |
| tree | e504b213dad8173ed55c1db6a374bd47b0618eb6 | |
| parent | b8ad0ddccbd2eaea6753973064317ef99e813a0d (diff) | |
| parent | cde1029151bf432ff1f5f41ea63939806206cfef (diff) | |
| download | podman-550270364bb533f29742534ff31e15cbf54c57da.tar.gz podman-550270364bb533f29742534ff31e15cbf54c57da.tar.bz2 podman-550270364bb533f29742534ff31e15cbf54c57da.zip | |
Merge pull request #1590 from baude/skipuserns
skip userns tests on non-fedora distributions for now
| -rwxr-xr-x | .papr.sh | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -6,6 +6,18 @@ export PATH=$HOME/gopath/bin:$PATH:$GOPATH/bin export GOSRC=$GOPATH/src/github.com/containers/libpod DIST=${DIST:=""} +CONTAINER_RUNTIME=${DIST:=""} + +source /etc/os-release + +INTEGRATION_TEST_ENVS="" + +# For all distributions not Fedora, we need to skip USERNS tests +# for now. +if [ "${ID}" != "fedora" ] || [ "${CONTAINER_RUNTIME}" != "" ]; then + INTEGRATION_TEST_ENVS="SKIP_USERNS=1" +fi + pwd # -i install @@ -121,11 +133,11 @@ fi # Run integration tests if [ $integrationtest -eq 1 ]; then make TAGS="${TAGS}" test-binaries - SKIP_USERNS=1 make varlink_generate GOPATH=/go + make varlink_generate GOPATH=/go if [ $runpython -eq 1 ]; then - SKIP_USERNS=1 make clientintegration GOPATH=/go + make clientintegration GOPATH=/go fi - SKIP_USERNS=1 make ginkgo GOPATH=/go + make ginkgo GOPATH=/go $INTEGRATION_TEST_ENVS fi |