diff options
| author | baude <bbaude@redhat.com> | 2018-10-04 11:08:28 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-05 08:48:41 -0500 |
| commit | cde1029151bf432ff1f5f41ea63939806206cfef (patch) | |
| tree | b4b90f9d1dfd1dea1b97b7fb74c936c75db1dec3 | |
| parent | 3c31e176c7dfce3c86a45ff4750f740a5f8f9321 (diff) | |
| download | podman-cde1029151bf432ff1f5f41ea63939806206cfef.tar.gz podman-cde1029151bf432ff1f5f41ea63939806206cfef.tar.bz2 podman-cde1029151bf432ff1f5f41ea63939806206cfef.zip | |
skip userns tests on non-fedora distributions for now
Signed-off-by: baude <bbaude@redhat.com>
| -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 |