diff --git a/.github/workflows/build_latest_podman.yml b/.github/workflows/build_latest_podman.yml index 13757cd..09e2a7a 100644 --- a/.github/workflows/build_latest_podman.yml +++ b/.github/workflows/build_latest_podman.yml @@ -336,7 +336,7 @@ jobs: -e podman_version_ubuntu=latest echo "Running podman_container tests..." - ADDITIONAL_PARAMS=" -e rootfs_tests=false " TEST2RUN=podman_container ./ci/run_containers_tests.sh + ANSIBLECMD="ansible-playbook -e rootfs_tests=false " TEST2RUN=podman_container ./ci/run_containers_tests.sh test-podman-idempotency-latest: name: Podman Idempotency test with latest Podman @@ -490,7 +490,7 @@ jobs: -e podman_version_ubuntu=latest echo "Running podman_container tests..." - TEST2RUN=podman_container_idempotency ./ci/run_containers_tests.sh + ANSIBLECMD="ansible-playbook -e rootfs_tests=false " TEST2RUN=podman_container_idempotency ./ci/run_containers_tests.sh # notify-results: # name: Notify test results diff --git a/ci/run_containers_tests.sh b/ci/run_containers_tests.sh index 97cf4a4..d9e4fd2 100755 --- a/ci/run_containers_tests.sh +++ b/ci/run_containers_tests.sh @@ -21,7 +21,7 @@ CMD="ANSIBLE_ROLES_PATH=${CURWD}/../tests/integration/targets \ ${ANSIBLECMD:-ansible-playbook} \ -i localhost, -c local --diff \ ci/playbooks/containers/${TEST2RUN}.yml \ - -e _ansible_python_interpreter=$(command -v python) ${ADDITIONAL_PARAMS:-''}" + -e _ansible_python_interpreter=$(command -v python)" bash -c "$CMD -vv" || exit_code=$? if [[ "$exit_code" != 0 ]]; then diff --git a/tests/integration/targets/podman_container_idempotency/tasks/idem_ports.yml b/tests/integration/targets/podman_container_idempotency/tasks/idem_ports.yml index 29ad10c..19531a8 100644 --- a/tests/integration/targets/podman_container_idempotency/tasks/idem_ports.yml +++ b/tests/integration/targets/podman_container_idempotency/tasks/idem_ports.yml @@ -23,99 +23,99 @@ assert: that: test1 is not changed -- containers.podman.podman_container: - executable: "{{ test_executable | default('podman') }}" - image: "{{ idem_image }}" - name: idempotency - state: present - command: 1h - ports: - - "4444:4444/tcp" - - "1212:5555" - - "8888:19191/udp" - - "19000:19000/udp" - - "127.0.0.1:7671:7676/udp" - - "127.0.0.1:12122:8876/udp" - - "127.0.0.1:13122:8871/tcp" - - "127.0.0.1:43423:8872" - - "127.0.0.2:43423:8872/tcp" - - "127.0.0.3:43423:8872" - - "0.0.0.0:15674:7846" - - 127.0.0.1:20000-20010:20000-20010/udp - - 0.0.0.0:20000-20010:20000-20010/tcp - - "10000-10010:10000-10010/udp" - - "[::1]:3001-3003:3001-3003" - register: test2 +# - containers.podman.podman_container: +# executable: "{{ test_executable | default('podman') }}" +# image: "{{ idem_image }}" +# name: idempotency +# state: present +# command: 1h +# ports: +# - "4444:4444/tcp" +# - "1212:5555" +# - "8888:19191/udp" +# - "19000:19000/udp" +# - "127.0.0.1:7671:7676/udp" +# - "127.0.0.1:12122:8876/udp" +# - "127.0.0.1:13122:8871/tcp" +# - "127.0.0.1:43423:8872" +# - "127.0.0.2:43423:8872/tcp" +# - "127.0.0.3:43423:8872" +# - "0.0.0.0:15674:7846" +# - 127.0.0.1:20000-20010:20000-20010/udp +# - 0.0.0.0:20000-20010:20000-20010/tcp +# - "10000-10010:10000-10010/udp" +# - "[::1]:3001-3003:3001-3003" +# register: test2 -- name: check test2 - assert: - that: test2 is changed +# - name: check test2 +# assert: +# that: test2 is changed -- containers.podman.podman_container: - executable: "{{ test_executable | default('podman') }}" - image: "{{ idem_image }}" - name: idempotency - state: present - command: 1h - ports: - - "4444:4444/tcp" - - "1212:5555" - - "8888:19191/udp" - - "19000:19000/udp" - - "127.0.0.1:7671:7676/udp" - - "127.0.0.1:12122:8876/udp" - - "127.0.0.1:13122:8871/tcp" - - "127.0.0.1:43423:8872" - - "127.0.0.2:43423:8872/tcp" - - "127.0.0.3:43423:8872" - - "0.0.0.0:15674:7846" - - 127.0.0.1:20000-20010:20000-20010/udp - - 0.0.0.0:20000-20010:20000-20010/tcp - - "10000-10010:10000-10010/udp" - - "[::1]:3001-3003:3001-3003" - register: test3 +# - containers.podman.podman_container: +# executable: "{{ test_executable | default('podman') }}" +# image: "{{ idem_image }}" +# name: idempotency +# state: present +# command: 1h +# ports: +# - "4444:4444/tcp" +# - "1212:5555" +# - "8888:19191/udp" +# - "19000:19000/udp" +# - "127.0.0.1:7671:7676/udp" +# - "127.0.0.1:12122:8876/udp" +# - "127.0.0.1:13122:8871/tcp" +# - "127.0.0.1:43423:8872" +# - "127.0.0.2:43423:8872/tcp" +# - "127.0.0.3:43423:8872" +# - "0.0.0.0:15674:7846" +# - 127.0.0.1:20000-20010:20000-20010/udp +# - 0.0.0.0:20000-20010:20000-20010/tcp +# - "10000-10010:10000-10010/udp" +# - "[::1]:3001-3003:3001-3003" +# register: test3 -- name: check test3 - assert: - that: test3 is not changed +# - name: check test3 +# assert: +# that: test3 is not changed -- containers.podman.podman_container: - executable: "{{ test_executable | default('podman') }}" - image: "{{ idem_image }}" - name: idempotency - state: present - publish_all: true - command: 1h - register: test4 +# - containers.podman.podman_container: +# executable: "{{ test_executable | default('podman') }}" +# image: "{{ idem_image }}" +# name: idempotency +# state: present +# publish_all: true +# command: 1h +# register: test4 -- name: check test4 - assert: - that: test4 is changed +# - name: check test4 +# assert: +# that: test4 is changed -- containers.podman.podman_container: - executable: "{{ test_executable | default('podman') }}" - image: "{{ idem_image }}" - name: idempotency - state: present - publish_all: true - command: 1h - register: test5 +# - containers.podman.podman_container: +# executable: "{{ test_executable | default('podman') }}" +# image: "{{ idem_image }}" +# name: idempotency +# state: present +# publish_all: true +# command: 1h +# register: test5 -- name: check test5 - assert: - that: test5 is not changed +# - name: check test5 +# assert: +# that: test5 is not changed -- containers.podman.podman_container: - executable: "{{ test_executable | default('podman') }}" - image: "{{ idem_image }}" - name: idempotency - state: present - command: 1h - register: test6 +# - containers.podman.podman_container: +# executable: "{{ test_executable | default('podman') }}" +# image: "{{ idem_image }}" +# name: idempotency +# state: present +# command: 1h +# register: test6 -- name: check test6 - assert: - that: test6 is changed +# - name: check test6 +# assert: +# that: test6 is changed - containers.podman.podman_container: executable: "{{ test_executable | default('podman') }}"