diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-04 20:02:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 20:02:43 +0200 |
| commit | b0578963aaf83e4c5686b957fd09c9311eac35c6 (patch) | |
| tree | 436c00a73743e29b4a800a5071fd4d8df7f9accf | |
| parent | 6cc323cb7872a6c52c71530170d781ca76f78f00 (diff) | |
| parent | 77b8187ea08bd32217d1739b880a3629c3a43709 (diff) | |
| download | podman-b0578963aaf83e4c5686b957fd09c9311eac35c6.tar.gz podman-b0578963aaf83e4c5686b957fd09c9311eac35c6.tar.bz2 podman-b0578963aaf83e4c5686b957fd09c9311eac35c6.zip | |
Merge pull request #6338 from rhatdan/build3
Attempt to turn on special_testing_in_podman tests
| -rw-r--r-- | .cirrus.yml | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index bc3bffd96..58c7cd871 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -511,7 +511,6 @@ special_testing_rootless_task: special_testing_in_podman_task: - skip: $CI == 'true' alias: "special_testing_in_podman" depends_on: - "gating" diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index c92f123fd..1aef678d4 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -18,7 +18,7 @@ cd "$GOSRC" case "$SPECIALMODE" in in_podman) - ${CONTAINER_RUNTIME} run --rm --privileged --net=host \ + ${CONTAINER_RUNTIME} run --rm --privileged --net=host --cgroupns=host \ -v $GOSRC:$GOSRC:Z \ --workdir $GOSRC \ -e "CGROUP_MANAGER=cgroupfs" \ |