diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index 0e54c13..fbb40bc 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -69,6 +69,15 @@ jobs: runner-python-version: 2.7 ansible-version: ansible<2.10 python-version: 2.7 + - runner-os: ubuntu-22.04 + runner-python-version: '3.10' + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: '3.10' + exclude: + - runner-os: ubuntu-22.04 + runner-python-version: 3.8 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: 3.8 steps: - name: Set up Python ${{ matrix.runner-python-version }} diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml index 1e2addb..1583395 100644 --- a/.github/workflows/connections_tests.yml +++ b/.github/workflows/connections_tests.yml @@ -85,8 +85,8 @@ jobs: #- ubuntu-16.04 #- macos-latest python-version: - - 3.8 - #- 3.9 + #- 3.8 + - 3.9 #- 3.6 #- 3.5 #- 2.7 @@ -133,9 +133,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi @@ -176,8 +175,8 @@ jobs: #- ubuntu-16.04 #- macos-latest python-version: - - 3.8 - #- 3.9 + #- 3.8 + - 3.9 #- 3.6 #- 3.5 #- 2.7 @@ -224,9 +223,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index 223ee0c..24006e2 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -94,9 +94,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi @@ -177,9 +176,8 @@ jobs: export PATH=~/.local/bin:$PATH export ANSIBLE_COLLECTIONS_PATHS=~/.local/share/ansible/collections - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index 9826402..b6fb18b 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -91,9 +91,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi @@ -113,9 +112,8 @@ jobs: - name: Run idempotency tests for podman container run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi TEST2RUN=podman_container_idempotency ./ci/run_containers_tests.sh diff --git a/.github/workflows/podman_container_info.yml b/.github/workflows/podman_container_info.yml index 9334d8d..5dc8044 100644 --- a/.github/workflows/podman_container_info.yml +++ b/.github/workflows/podman_container_info.yml @@ -92,9 +92,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index 4e6bbcc..f89eab0 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -94,9 +94,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_export.yml b/.github/workflows/podman_export.yml index 2839bcc..0802b03 100644 --- a/.github/workflows/podman_export.yml +++ b/.github/workflows/podman_export.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml index 75a5b63..a145efd 100644 --- a/.github/workflows/podman_image.yml +++ b/.github/workflows/podman_image.yml @@ -88,9 +88,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml index bd73e5a..4b3153e 100644 --- a/.github/workflows/podman_image_info.yml +++ b/.github/workflows/podman_image_info.yml @@ -88,9 +88,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_import.yml b/.github/workflows/podman_import.yml index d7d71d0..d4dc584 100644 --- a/.github/workflows/podman_import.yml +++ b/.github/workflows/podman_import.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_load.yml b/.github/workflows/podman_load.yml index c4c6714..b670c4b 100644 --- a/.github/workflows/podman_load.yml +++ b/.github/workflows/podman_load.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_login.yml b/.github/workflows/podman_login.yml index a0a300b..d5e4399 100644 --- a/.github/workflows/podman_login.yml +++ b/.github/workflows/podman_login.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_login_info.yml b/.github/workflows/podman_login_info.yml index d3c89c8..c356f12 100644 --- a/.github/workflows/podman_login_info.yml +++ b/.github/workflows/podman_login_info.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_logout.yml b/.github/workflows/podman_logout.yml index c97ae73..57d8d2b 100644 --- a/.github/workflows/podman_logout.yml +++ b/.github/workflows/podman_logout.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_network.yml b/.github/workflows/podman_network.yml index 95d6676..8f6ded7 100644 --- a/.github/workflows/podman_network.yml +++ b/.github/workflows/podman_network.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_network_info.yml b/.github/workflows/podman_network_info.yml index a4aa71d..f538381 100644 --- a/.github/workflows/podman_network_info.yml +++ b/.github/workflows/podman_network_info.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_play.yml b/.github/workflows/podman_play.yml index 2f32b59..57409a3 100644 --- a/.github/workflows/podman_play.yml +++ b/.github/workflows/podman_play.yml @@ -87,9 +87,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_pod.yml b/.github/workflows/podman_pod.yml index b237ecd..ebff140 100644 --- a/.github/workflows/podman_pod.yml +++ b/.github/workflows/podman_pod.yml @@ -91,9 +91,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_pod_info.yml b/.github/workflows/podman_pod_info.yml index d7d0b07..877fe64 100644 --- a/.github/workflows/podman_pod_info.yml +++ b/.github/workflows/podman_pod_info.yml @@ -91,9 +91,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_save.yml b/.github/workflows/podman_save.yml index aa37d27..ae4ec26 100644 --- a/.github/workflows/podman_save.yml +++ b/.github/workflows/podman_save.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_secret.yml b/.github/workflows/podman_secret.yml index a87bba7..84b5db8 100644 --- a/.github/workflows/podman_secret.yml +++ b/.github/workflows/podman_secret.yml @@ -89,9 +89,8 @@ jobs: run: | export PATH=~/.local/bin:$PATH - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi @@ -172,9 +171,8 @@ jobs: export PATH=~/.local/bin:$PATH export ANSIBLE_COLLECTIONS_PATHS=~/.local/share/ansible/collections - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_tag.yml b/.github/workflows/podman_tag.yml index 94cfbc4..1c27113 100644 --- a/.github/workflows/podman_tag.yml +++ b/.github/workflows/podman_tag.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_volume.yml b/.github/workflows/podman_volume.yml index 8a09718..1288c1c 100644 --- a/.github/workflows/podman_volume.yml +++ b/.github/workflows/podman_volume.yml @@ -86,9 +86,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi diff --git a/.github/workflows/podman_volume_info.yml b/.github/workflows/podman_volume_info.yml index c04257a..0420425 100644 --- a/.github/workflows/podman_volume_info.yml +++ b/.github/workflows/podman_volume_info.yml @@ -88,9 +88,8 @@ jobs: command -v ansible ansible --version - if [[ '${{ matrix.ansible-version }}' == 'git+https://github.com/ansible/ansible.git@devel' ]]; then - export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg - elif [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then + export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg + if [[ '${{ matrix.ansible-version }}' == 'ansible<2.10' ]]; then export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg fi