extra commits to run container.

rjeffman · Jun 22, 2024 · ad32a87 · ad32a87
1 parent 1a46d2a
commit ad32a87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/azure/pr-pipeline.yml b/tests/azure/pr-pipeline.yml
@@ -3,7 +3,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-20.04'
 
 stages:
 

diff --git a/tests/azure/templates/playbook_fast.yml b/tests/azure/templates/playbook_fast.yml
@@ -50,14 +50,18 @@ jobs:
       cp -a plugins/modules/* ~/.ansible/library
       cp -a plugins/module_utils/* ~/.ansible/module_utils
       docker pull -q quay.io/ansible-freeipa/upstream-tests:${{ parameters.scenario }}
-      docker create \
+      podman create \
         --hostname ${HOSTNAME} \
         --memory 3g \
         --memory-swap -1 \
         --add-host ${HOSTNAME}:127.0.0.1 \
+        --volume /sys/fs/cgroup:/sys/fs/cgroup:ro \
+        --tmpfs /run \
+        --tmpfs /tmp \
+        --privileged \
         --name ${{ parameters.scenario }} \
         quay.io/ansible-freeipa/upstream-tests:${{ parameters.scenario }}
-      docker start ${{ parameters.scenario }}
+      podman start ${{ parameters.scenario }}
     retryCountOnTaskFailure: 5
     displayName: Setup test container
     env:
@@ -85,7 +89,7 @@ jobs:
     displayName: Run playbook tests
     env:
       IPA_SERVER_HOST: ${{ parameters.scenario }}
-      RUN_TESTS_IN_DOCKER: true
+      RUN_TESTS_IN_DOCKER: podman
       IPA_DISABLED_MODULES: ${{ variables.ipa_disabled_modules }}
       IPA_DISABLED_TESTS: ${{ variables.ipa_disabled_tests }}
       IPA_VERBOSITY: "-vvv"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ trigger: @@
     - master
     pool:
-      vmImage: 'ubuntu-22.04'
+      vmImage: 'ubuntu-20.04'
     stages:
@@ Expand Down @@