From ba763e2988c4d3f94940695a5699f26fb94ed31f Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 7 Apr 2021 11:13:58 +0300 Subject: [PATCH] Add Ansible 2.11 to all tests and use Ubuntu 20.04 (#243) --- .github/workflows/podman_container.yml | 12 ++++-------- .github/workflows/podman_container_idem.yml | 10 ++++------ .github/workflows/podman_container_info.yml | 8 +++----- .github/workflows/podman_containers.yml | 12 ++++-------- .github/workflows/podman_image.yml | 10 ++++------ .github/workflows/podman_image_info.yml | 10 ++++------ .github/workflows/podman_login.yml | 10 ++++------ .github/workflows/podman_login_info.yml | 10 ++++------ .github/workflows/podman_logout.yml | 10 ++++------ .github/workflows/podman_network.yml | 10 ++++------ .github/workflows/podman_network_info.yml | 10 ++++------ .github/workflows/podman_pod.yml | 10 ++++------ .github/workflows/podman_pod_info.yml | 10 ++++------ .github/workflows/podman_volume.yml | 10 ++++------ .github/workflows/podman_volume_info.yml | 10 ++++------ 15 files changed, 59 insertions(+), 93 deletions(-) diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index f25c65a..d082164 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -41,17 +41,13 @@ jobs: matrix: ansible-version: - ansible<2.10 + - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: ansible<2.11 - python-version: 3.7 - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.8 + steps: - name: Check out repository diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index a7b10bf..7bd849d 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -39,15 +39,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - "ansible-version": git+https://github.com/ansible/ansible.git@devel - "python-version": 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_container_info.yml b/.github/workflows/podman_container_info.yml index f5019ed..4c26210 100644 --- a/.github/workflows/podman_container_info.yml +++ b/.github/workflows/podman_container_info.yml @@ -41,15 +41,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-latest python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index bcf8c0a..85778bf 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -41,17 +41,13 @@ jobs: matrix: ansible-version: - ansible<2.10 + - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: ansible<2.11 - python-version: 3.7 - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.8 + steps: - name: Check out repository diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml index 7300ff1..2c7481f 100644 --- a/.github/workflows/podman_image.yml +++ b/.github/workflows/podman_image.yml @@ -37,15 +37,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml index e900b18..9d34ec8 100644 --- a/.github/workflows/podman_image_info.yml +++ b/.github/workflows/podman_image_info.yml @@ -37,15 +37,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_login.yml b/.github/workflows/podman_login.yml index 8468efc..f6c922c 100644 --- a/.github/workflows/podman_login.yml +++ b/.github/workflows/podman_login.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_login_info.yml b/.github/workflows/podman_login_info.yml index 490aca5..4c7d1ed 100644 --- a/.github/workflows/podman_login_info.yml +++ b/.github/workflows/podman_login_info.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_logout.yml b/.github/workflows/podman_logout.yml index 1c3d61e..032a1e8 100644 --- a/.github/workflows/podman_logout.yml +++ b/.github/workflows/podman_logout.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_network.yml b/.github/workflows/podman_network.yml index 7d1dfc8..709bc09 100644 --- a/.github/workflows/podman_network.yml +++ b/.github/workflows/podman_network.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_network_info.yml b/.github/workflows/podman_network_info.yml index a673d30..1e516e8 100644 --- a/.github/workflows/podman_network_info.yml +++ b/.github/workflows/podman_network_info.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_pod.yml b/.github/workflows/podman_pod.yml index 8a6ca58..c806cb3 100644 --- a/.github/workflows/podman_pod.yml +++ b/.github/workflows/podman_pod.yml @@ -39,15 +39,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - #- git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_pod_info.yml b/.github/workflows/podman_pod_info.yml index 0a1bd87..7d18043 100644 --- a/.github/workflows/podman_pod_info.yml +++ b/.github/workflows/podman_pod_info.yml @@ -39,15 +39,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - #- git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_volume.yml b/.github/workflows/podman_volume.yml index 16302e2..170fc32 100644 --- a/.github/workflows/podman_volume.yml +++ b/.github/workflows/podman_volume.yml @@ -35,15 +35,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository diff --git a/.github/workflows/podman_volume_info.yml b/.github/workflows/podman_volume_info.yml index 35beed6..e5a3ff4 100644 --- a/.github/workflows/podman_volume_info.yml +++ b/.github/workflows/podman_volume_info.yml @@ -37,15 +37,13 @@ jobs: matrix: ansible-version: - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.10 + # - git+https://github.com/ansible/ansible.git@stable-2.11 + - git+https://github.com/ansible/ansible.git@devel os: - - ubuntu-latest + - ubuntu-20.04 python-version: - 3.7 - include: - - os: ubuntu-20.04 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.7 + steps: - name: Check out repository