From ecd50a7874194ef722a7353fe509fc3fba56762e Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 7 Apr 2021 10:50:03 +0300 Subject: [PATCH] Add Ansible 2.11 to testing (#242) --- .../collection-continuous-integration.yml | 25 ++--------- .../workflows/collection-publish-dry-run.yml | 4 +- .github/workflows/collection-publish.yml | 4 +- .github/workflows/connections_tests.yml | 42 +++++++++---------- 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index 24d5dce..31ef726 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -13,9 +13,9 @@ jobs: strategy: matrix: runner-os: - - ubuntu-latest + - ubuntu-20.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.10 + - git+https://github.com/ansible/ansible.git@stable-2.11 runner-python-version: - 3.8 steps: @@ -55,37 +55,20 @@ jobs: fail-fast: false matrix: runner-os: - - ubuntu-latest + - ubuntu-20.04 runner-python-version: - 3.8 ansible-version: - ansible<2.10 - - ansible-base<2.11 + - git+https://github.com/ansible/ansible.git@stable-2.11 - git+https://github.com/ansible/ansible.git@devel python-version: - 3.8 - exclude: - - runner-os: ubuntu-latest - runner-python-version: 3.8 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.8 - - runner-os: ubuntu-latest - runner-python-version: 3.8 - ansible-version: ansible-base<2.11 - python-version: 3.8 include: - runner-os: ubuntu-latest runner-python-version: 2.7 ansible-version: ansible<2.10 python-version: 2.7 - - runner-os: ubuntu-20.04 - runner-python-version: 3.8 - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.8 - - runner-os: ubuntu-20.04 - runner-python-version: 3.8 - ansible-version: ansible-base<2.11 - python-version: 3.8 steps: - name: Set up Python ${{ matrix.runner-python-version }} diff --git a/.github/workflows/collection-publish-dry-run.yml b/.github/workflows/collection-publish-dry-run.yml index ea71fd6..e5ffdc7 100644 --- a/.github/workflows/collection-publish-dry-run.yml +++ b/.github/workflows/collection-publish-dry-run.yml @@ -26,9 +26,9 @@ jobs: strategy: matrix: runner-os: - - ubuntu-16.04 + - ubuntu-20.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.10 + - git+https://github.com/ansible/ansible.git@stable-2.11 runner-python-version: - 3.7 steps: diff --git a/.github/workflows/collection-publish.yml b/.github/workflows/collection-publish.yml index 36d553a..1f6aea4 100644 --- a/.github/workflows/collection-publish.yml +++ b/.github/workflows/collection-publish.yml @@ -11,9 +11,9 @@ jobs: strategy: matrix: runner-os: - - ubuntu-16.04 + - ubuntu-20.04 ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.10 + - git+https://github.com/ansible/ansible.git@stable-2.11 runner-python-version: - 3.7 steps: diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml index f976b49..c747fd7 100644 --- a/.github/workflows/connections_tests.yml +++ b/.github/workflows/connections_tests.yml @@ -31,11 +31,11 @@ jobs: strategy: matrix: runner-os: - - ubuntu-latest + - ubuntu-20.04 ansible-version: - - git+https://github.com/ansible/ansible.git@devel + - git+https://github.com/ansible/ansible.git@stable-2.11 runner-python-version: - - 3.7 + - 3.8 steps: - name: Check out ${{ github.repository }} on disk uses: actions/checkout@master @@ -65,10 +65,10 @@ jobs: path: .cache/collection-tarballs test-podman-connection: - name: Podman connection VM ${{ matrix.os || 'ubuntu-latest' }}-${{ matrix.ansible-version }} + name: Podman connection VM ${{ matrix.os || 'ubuntu-20.04' }}-${{ matrix.ansible-version }} needs: - build-collection-artifact-connection-tests - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + runs-on: ${{ matrix.os || 'ubuntu-20.04' }} defaults: run: shell: bash @@ -77,22 +77,20 @@ 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 #- ubuntu-20.04 #- ubuntu-16.04 #- macos-latest python-version: - #- 3.8 - - 3.7 + - 3.8 + #- 3.7 #- 3.6 #- 3.5 #- 2.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 @@ -158,10 +156,10 @@ jobs: shell: bash test-buildah-connection: - name: Buildah connection VM ${{ matrix.os || 'ubuntu-latest' }}-${{ matrix.ansible-version }} + name: Buildah connection VM ${{ matrix.os || 'ubuntu-20.04' }}-${{ matrix.ansible-version }} needs: - build-collection-artifact-connection-tests - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + runs-on: ${{ matrix.os || 'ubuntu-20.04' }} defaults: run: shell: bash @@ -170,22 +168,20 @@ 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 #- ubuntu-20.04 #- ubuntu-16.04 #- macos-latest python-version: - #- 3.8 - - 3.7 + - 3.8 + #- 3.7 #- 3.6 #- 3.5 #- 2.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