diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index 52cab5a..de3e1e5 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -65,7 +65,7 @@ jobs: python-version: - 3.8 include: - - runner-os: ubuntu-latest + - runner-os: ubuntu-20.04 runner-python-version: 2.7 ansible-version: ansible<2.10 python-version: 2.7 diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index e2eb8e4..4e0ca4b 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -31,8 +31,8 @@ on: jobs: test_podman_container: - name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -115,8 +115,8 @@ jobs: shell: bash test_podman_container_with_pip: - name: Podman container w/ pip ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman container w/ pip ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index 4da383d..b98a789 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -29,8 +29,8 @@ on: jobs: test_podman_container_idem: - name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_container_info.yml b/.github/workflows/podman_container_info.yml index 12096af..6adc921 100644 --- a/.github/workflows/podman_container_info.yml +++ b/.github/workflows/podman_container_info.yml @@ -31,8 +31,8 @@ on: jobs: test_podman_container_info: - name: Podman container info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman container info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -44,7 +44,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index 42db36c..f7b524d 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -31,8 +31,8 @@ on: jobs: test_podman_containers: - name: Podman multi containers ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman multi containers ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_export.yml b/.github/workflows/podman_export.yml index 6ece930..81e3cb9 100644 --- a/.github/workflows/podman_export.yml +++ b/.github/workflows/podman_export.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_export: - name: Podman export ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman export ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_generate_systemd.yml b/.github/workflows/podman_generate_systemd.yml index 0b049f3..b0541de 100644 --- a/.github/workflows/podman_generate_systemd.yml +++ b/.github/workflows/podman_generate_systemd.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_generate_systemd: - name: Podman generate systemd ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman generate systemd ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml index 1b4cb2b..772701f 100644 --- a/.github/workflows/podman_image.yml +++ b/.github/workflows/podman_image.yml @@ -27,8 +27,8 @@ on: jobs: test_podman_image: - name: Podman image ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman image ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml index 371a198..b1ad62e 100644 --- a/.github/workflows/podman_image_info.yml +++ b/.github/workflows/podman_image_info.yml @@ -27,8 +27,8 @@ on: jobs: test_podman_image_info: - name: Podman image info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman image info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_import.yml b/.github/workflows/podman_import.yml index b895784..988fc0e 100644 --- a/.github/workflows/podman_import.yml +++ b/.github/workflows/podman_import.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_import: - name: Podman import ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman import ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_load.yml b/.github/workflows/podman_load.yml index 7d2ea48..fd7bc49 100644 --- a/.github/workflows/podman_load.yml +++ b/.github/workflows/podman_load.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_load: - name: Podman load ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman load ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_login.yml b/.github/workflows/podman_login.yml index 74545fe..098762c 100644 --- a/.github/workflows/podman_login.yml +++ b/.github/workflows/podman_login.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_login: - name: Podman login ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman login ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_login_info.yml b/.github/workflows/podman_login_info.yml index 67891c9..1643d8d 100644 --- a/.github/workflows/podman_login_info.yml +++ b/.github/workflows/podman_login_info.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_login_info: - name: Podman login info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman login info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_logout.yml b/.github/workflows/podman_logout.yml index 6e054e7..98a099d 100644 --- a/.github/workflows/podman_logout.yml +++ b/.github/workflows/podman_logout.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_logout: - name: Podman logout ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman logout ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_network.yml b/.github/workflows/podman_network.yml index 5c6e1cb..010b562 100644 --- a/.github/workflows/podman_network.yml +++ b/.github/workflows/podman_network.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_network: - name: Podman network ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman network ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_network_info.yml b/.github/workflows/podman_network_info.yml index 5f62318..bd99ba0 100644 --- a/.github/workflows/podman_network_info.yml +++ b/.github/workflows/podman_network_info.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_network_info: - name: Podman network info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman network info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_play.yml b/.github/workflows/podman_play.yml index 685fffb..0c90aab 100644 --- a/.github/workflows/podman_play.yml +++ b/.github/workflows/podman_play.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_play: - name: Podman play ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman play ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_pod.yml b/.github/workflows/podman_pod.yml index 8709267..bb68371 100644 --- a/.github/workflows/podman_pod.yml +++ b/.github/workflows/podman_pod.yml @@ -29,8 +29,8 @@ on: jobs: test_podman_pod: - name: Podman pod ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman pod ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_pod_info.yml b/.github/workflows/podman_pod_info.yml index f4981f1..dc30341 100644 --- a/.github/workflows/podman_pod_info.yml +++ b/.github/workflows/podman_pod_info.yml @@ -29,8 +29,8 @@ on: jobs: test_podman_pod_info: - name: Podman pod info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman pod info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_save.yml b/.github/workflows/podman_save.yml index f2365a9..f413fc0 100644 --- a/.github/workflows/podman_save.yml +++ b/.github/workflows/podman_save.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_save: - name: Podman save ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman save ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_secret.yml b/.github/workflows/podman_secret.yml index 7e274a3..b454727 100644 --- a/.github/workflows/podman_secret.yml +++ b/.github/workflows/podman_secret.yml @@ -27,8 +27,8 @@ on: jobs: test_podman_secret: - name: Podman secret ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman secret ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -110,8 +110,8 @@ jobs: shell: bash test_podman_secret_with_pip: - name: Podman secret w/ pip ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman secret w/ pip ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_tag.yml b/.github/workflows/podman_tag.yml index bab3897..a99117a 100644 --- a/.github/workflows/podman_tag.yml +++ b/.github/workflows/podman_tag.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_tag: - name: Podman tag ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman tag ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_volume.yml b/.github/workflows/podman_volume.yml index 51d4b75..b3b60b2 100644 --- a/.github/workflows/podman_volume.yml +++ b/.github/workflows/podman_volume.yml @@ -25,8 +25,8 @@ on: jobs: test_podman_volume: - name: Podman volume ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman volume ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/.github/workflows/podman_volume_info.yml b/.github/workflows/podman_volume_info.yml index 8df97bc..2ddfd2a 100644 --- a/.github/workflows/podman_volume_info.yml +++ b/.github/workflows/podman_volume_info.yml @@ -27,8 +27,8 @@ on: jobs: test_podman_volume_info: - name: Podman volume info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }} - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + name: Podman volume info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-22.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/ci/playbooks/install_repos.yml b/ci/playbooks/install_repos.yml index 5a24775..7b7ffcd 100644 --- a/ci/playbooks/install_repos.yml +++ b/ci/playbooks/install_repos.yml @@ -3,7 +3,7 @@ become: true shell: | . /etc/os-release - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${VERSION_ID}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | apt-key add - apt-get update when: ansible_distribution|lower == "ubuntu" diff --git a/ci/playbooks/pre.yml b/ci/playbooks/pre.yml index 0482932..07bfd5f 100644 --- a/ci/playbooks/pre.yml +++ b/ci/playbooks/pre.yml @@ -63,6 +63,7 @@ - vim - dnsmasq - slirp4netns + state: latest - name: Discover slirp4netns version shell: slirp4netns -v | grep version | awk {'print $3'} diff --git a/plugins/modules/podman_pod_info.py b/plugins/modules/podman_pod_info.py index dd25c5c..8b2a4bf 100644 --- a/plugins/modules/podman_pod_info.py +++ b/plugins/modules/podman_pod_info.py @@ -109,7 +109,7 @@ def get_pod_info(module, executable, name): rc, out, err = module.run_command(command + [pod]) errs.append(err.strip()) rcs += [rc] - if not out or json.loads(out) is None: + if not out or json.loads(out) is None or not json.loads(out): continue result.append(json.loads(out)) return result, errs, rcs diff --git a/tests/integration/targets/podman_container/tasks/main.yml b/tests/integration/targets/podman_container/tasks/main.yml index 992a279..217a87a 100644 --- a/tests/integration/targets/podman_container/tasks/main.yml +++ b/tests/integration/targets/podman_container/tasks/main.yml @@ -609,7 +609,7 @@ - system1.podman_systemd.keys() | list | first == 'containzzzzcontainer1' - system1.podman_systemd.values() | list | length > 0 - service_file.stat.exists | bool - - "'stop -t 120 container1' in system1.podman_systemd.values() | list | first" + - "'-t 120 container1' in system1.podman_systemd.values() | list | first" - "'Restart=always' in system1.podman_systemd.values() | list | first" - "'autogenerated by Podman' not in system1.podman_systemd.values() | list | first" diff --git a/tests/integration/targets/podman_pod/tasks/main.yml b/tests/integration/targets/podman_pod/tasks/main.yml index 990f727..fcc6a4d 100644 --- a/tests/integration/targets/podman_pod/tasks/main.yml +++ b/tests/integration/targets/podman_pod/tasks/main.yml @@ -298,19 +298,6 @@ that: - pod13_info is not changed - - name: Start pod without shares - containers.podman.podman_pod: - executable: "{{ test_executable | default('podman') }}" - name: pod1 - state: started - share: "" - register: pod14_info - - - name: Check info - assert: - that: - - pod14_info is changed - - name: Start pod with default shares containers.podman.podman_pod: executable: "{{ test_executable | default('podman') }}" @@ -729,7 +716,7 @@ assert: that: - system1.podman_systemd.keys() | list | length == 3 - - "'stop -t 120 ' in system1.podman_systemd['poditto-pod2']" + - "'-t 120 ' in system1.podman_systemd['poditto-pod2']" - "'Restart=always' in system1.podman_systemd['poditto-pod2']" - "'autogenerated by Podman' not in system1.podman_systemd['poditto-pod2']" - podsys_stat.stat.exists | bool diff --git a/tests/integration/targets/podman_save/tasks/main.yml b/tests/integration/targets/podman_save/tasks/main.yml index 8c2339d..97c8a66 100644 --- a/tests/integration/targets/podman_save/tasks/main.yml +++ b/tests/integration/targets/podman_save/tasks/main.yml @@ -54,6 +54,15 @@ that: - img.stat.exists +- name: Save image + containers.podman.podman_save: + executable: "{{ test_executable | default('podman') }}" + image: k8s.gcr.io/pause + dest: /tmp/imagedir-docker + force: true + format: docker-dir + compress: true + - name: Save image containers.podman.podman_save: executable: "{{ test_executable | default('podman') }}" @@ -61,7 +70,6 @@ dest: /tmp/imagedir force: true format: oci-dir - compress: true - name: Check file stat: