summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-22 06:02:23 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-06-04 10:58:37 -0400
commit77b8187ea08bd32217d1739b880a3629c3a43709 (patch)
tree7ece02521fa992769121ab399f1b8d2e0eaa5ffa
parentceef4f6819212ff320bc0582d637693516561643 (diff)
downloadpodman-77b8187ea08bd32217d1739b880a3629c3a43709.tar.gz
podman-77b8187ea08bd32217d1739b880a3629c3a43709.tar.bz2
podman-77b8187ea08bd32217d1739b880a3629c3a43709.zip
Attempt to turn on special_testing_in_podman tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--.cirrus.yml1
-rwxr-xr-xcontrib/cirrus/integration_test.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 292f83951..b6bd679af 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -512,7 +512,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" \