diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index 8747ba4..0e54c13 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: runner-os: - - ubuntu-20.04 + - ubuntu-22.04 ansible-version: - git+https://github.com/ansible/ansible.git@stable-2.13 runner-python-version: @@ -55,7 +55,7 @@ jobs: fail-fast: false matrix: runner-os: - - ubuntu-20.04 + - ubuntu-22.04 runner-python-version: - 3.8 ansible-version: diff --git a/.github/workflows/collection-publish-dry-run.yml b/.github/workflows/collection-publish-dry-run.yml index 44c7b45..e94453e 100644 --- a/.github/workflows/collection-publish-dry-run.yml +++ b/.github/workflows/collection-publish-dry-run.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: runner-os: - - ubuntu-20.04 + - ubuntu-22.04 ansible-version: - git+https://github.com/ansible/ansible.git@stable-2.13 runner-python-version: diff --git a/.github/workflows/collection-publish.yml b/.github/workflows/collection-publish.yml index 476348c..918118d 100644 --- a/.github/workflows/collection-publish.yml +++ b/.github/workflows/collection-publish.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: runner-os: - - ubuntu-20.04 + - ubuntu-22.04 ansible-version: - git+https://github.com/ansible/ansible.git@stable-2.13 runner-python-version: diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml index e3a2727..1e2addb 100644 --- a/.github/workflows/connections_tests.yml +++ b/.github/workflows/connections_tests.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: runner-os: - - ubuntu-20.04 + - ubuntu-22.04 ansible-version: - git+https://github.com/ansible/ansible.git@stable-2.13 runner-python-version: @@ -65,10 +65,10 @@ jobs: path: .cache/collection-tarballs test-podman-connection: - name: Podman connection VM ${{ matrix.os || 'ubuntu-20.04' }}-${{ matrix.ansible-version }} + name: Podman connection VM ${{ matrix.os || 'ubuntu-22.04' }}-${{ matrix.ansible-version }} needs: - build-collection-artifact-connection-tests - runs-on: ${{ matrix.os || 'ubuntu-20.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -80,8 +80,8 @@ jobs: - git+https://github.com/ansible/ansible.git@stable-2.13 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 - #- ubuntu-20.04 + - ubuntu-22.04 + #- ubuntu-22.04 #- ubuntu-16.04 #- macos-latest python-version: @@ -156,10 +156,10 @@ jobs: shell: bash test-buildah-connection: - name: Buildah connection VM ${{ matrix.os || 'ubuntu-20.04' }}-${{ matrix.ansible-version }} + name: Buildah connection VM ${{ matrix.os || 'ubuntu-22.04' }}-${{ matrix.ansible-version }} needs: - build-collection-artifact-connection-tests - runs-on: ${{ matrix.os || 'ubuntu-20.04' }} + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -171,8 +171,8 @@ jobs: - git+https://github.com/ansible/ansible.git@stable-2.13 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 - #- ubuntu-20.04 + - ubuntu-22.04 + #- ubuntu-22.04 #- ubuntu-16.04 #- macos-latest python-version: diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index 41802c5..223ee0c 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -45,7 +45,7 @@ jobs: - git+https://github.com/ansible/ansible.git@stable-2.13 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 @@ -128,7 +128,7 @@ jobs: - ansible<2.10 #- git+https://github.com/ansible/ansible.git@stable-2.10 os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index d230070..9826402 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -42,7 +42,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index b614f34..4e6bbcc 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -45,7 +45,7 @@ jobs: - git+https://github.com/ansible/ansible.git@stable-2.13 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_export.yml b/.github/workflows/podman_export.yml index 6b0dee2..2839bcc 100644 --- a/.github/workflows/podman_export.yml +++ b/.github/workflows/podman_export.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml index c5f9c7f..75a5b63 100644 --- a/.github/workflows/podman_image.yml +++ b/.github/workflows/podman_image.yml @@ -40,7 +40,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml index a6ba51d..bd73e5a 100644 --- a/.github/workflows/podman_image_info.yml +++ b/.github/workflows/podman_image_info.yml @@ -40,7 +40,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_import.yml b/.github/workflows/podman_import.yml index 2006cc4..d7d71d0 100644 --- a/.github/workflows/podman_import.yml +++ b/.github/workflows/podman_import.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_load.yml b/.github/workflows/podman_load.yml index c4b2849..c4c6714 100644 --- a/.github/workflows/podman_load.yml +++ b/.github/workflows/podman_load.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_login.yml b/.github/workflows/podman_login.yml index e5d0345..a0a300b 100644 --- a/.github/workflows/podman_login.yml +++ b/.github/workflows/podman_login.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_login_info.yml b/.github/workflows/podman_login_info.yml index c0618cf..d3c89c8 100644 --- a/.github/workflows/podman_login_info.yml +++ b/.github/workflows/podman_login_info.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_logout.yml b/.github/workflows/podman_logout.yml index 0d794c5..c97ae73 100644 --- a/.github/workflows/podman_logout.yml +++ b/.github/workflows/podman_logout.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_network.yml b/.github/workflows/podman_network.yml index 1ebde20..95d6676 100644 --- a/.github/workflows/podman_network.yml +++ b/.github/workflows/podman_network.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_network_info.yml b/.github/workflows/podman_network_info.yml index 067627a..a4aa71d 100644 --- a/.github/workflows/podman_network_info.yml +++ b/.github/workflows/podman_network_info.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_play.yml b/.github/workflows/podman_play.yml index 618e033..2f32b59 100644 --- a/.github/workflows/podman_play.yml +++ b/.github/workflows/podman_play.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_pod.yml b/.github/workflows/podman_pod.yml index 6580d22..b237ecd 100644 --- a/.github/workflows/podman_pod.yml +++ b/.github/workflows/podman_pod.yml @@ -42,7 +42,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_pod_info.yml b/.github/workflows/podman_pod_info.yml index b38fb7e..d7d0b07 100644 --- a/.github/workflows/podman_pod_info.yml +++ b/.github/workflows/podman_pod_info.yml @@ -42,7 +42,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_save.yml b/.github/workflows/podman_save.yml index b9e6214..aa37d27 100644 --- a/.github/workflows/podman_save.yml +++ b/.github/workflows/podman_save.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_secret.yml b/.github/workflows/podman_secret.yml index e80fa2d..a87bba7 100644 --- a/.github/workflows/podman_secret.yml +++ b/.github/workflows/podman_secret.yml @@ -40,7 +40,7 @@ jobs: - git+https://github.com/ansible/ansible.git@stable-2.12 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 @@ -123,7 +123,7 @@ jobs: - ansible<2.10 #- git+https://github.com/ansible/ansible.git@stable-2.10 os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_tag.yml b/.github/workflows/podman_tag.yml index e193407..94cfbc4 100644 --- a/.github/workflows/podman_tag.yml +++ b/.github/workflows/podman_tag.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_volume.yml b/.github/workflows/podman_volume.yml index f06877a..8a09718 100644 --- a/.github/workflows/podman_volume.yml +++ b/.github/workflows/podman_volume.yml @@ -38,7 +38,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/.github/workflows/podman_volume_info.yml b/.github/workflows/podman_volume_info.yml index 95fe534..c04257a 100644 --- a/.github/workflows/podman_volume_info.yml +++ b/.github/workflows/podman_volume_info.yml @@ -40,7 +40,7 @@ jobs: # - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-20.04 + - ubuntu-22.04 python-version: - 3.9 diff --git a/ci/playbooks/pre.yml b/ci/playbooks/pre.yml index 62e2673..b9695c6 100644 --- a/ci/playbooks/pre.yml +++ b/ci/playbooks/pre.yml @@ -53,6 +53,9 @@ - name: Install repositories if need include_tasks: install_repos.yml + when: + - ansible_distribution == 'Ubuntu' + - ansible_distribution_major_version is version('22', '<') - name: Install podman package: