containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1590 from baude/skipuserns 

skip userns tests on non-fedora distributions for now
This commit is contained in:
OpenShift Merge Robot 2018-10-05 10:35:29 -07:00 committed by GitHub
parent b8ad0ddccb cde1029151
commit 550270364b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.papr.sh
View File

@ -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