diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 0d641dee..df081d6e 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -60,17 +60,6 @@ stages: test: '2.13/sanity/extra' - name: Units test: '2.13/units/1' - - stage: Ansible_2_12 - displayName: Sanity & Units 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.12/sanity/1' - - name: Units - test: '2.12/units/1' ### Docker - stage: Docker_2_13 displayName: Docker 2.13 @@ -94,22 +83,6 @@ stages: test: ubuntu1804 - name: Ubuntu 20.04 test: ubuntu2004 - - stage: Docker_2_12 - displayName: Docker 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.12/linux/{0}/1 - targets: - - name: CentOS 6 - test: centos6 - - name: Fedora 33 - test: fedora33 - - name: openSUSE 15 py3 - test: opensuse15 - - name: Ubuntu 20.04 - test: ubuntu2004 ### Remote - stage: Remote_2_13 @@ -130,20 +103,6 @@ stages: test: freebsd/12.3 - name: FreeBSD 13.0 test: freebsd/13.0 - - stage: Remote_2_12 - displayName: Remote 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.12/{0}/1 - targets: - # - name: macOS 11.1 - # test: macos/11.1 - - name: RHEL 8.4 - test: rhel/8.4 - - name: FreeBSD 13.0 - test: freebsd/13.0 ### cloud - stage: Cloud_2_13 displayName: Cloud 2.13 @@ -161,17 +120,6 @@ stages: # - test: 3.8 - test: 3.9 - test: "3.10" - - stage: Cloud_2_12 - displayName: Cloud 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.12/cloud/{0}/1 - targets: - - test: 2.6 - - test: 3.9 ## Finally @@ -179,12 +127,8 @@ stages: condition: succeededOrFailed() dependsOn: - Ansible_2_13 - - Ansible_2_12 - Remote_2_13 - - Remote_2_12 - Docker_2_13 - - Docker_2_12 - Cloud_2_13 - - Cloud_2_12 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 4c4ce7b7..e137be9e 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -25,6 +25,7 @@ jobs: - '2.9' - '2.10' - '2.11' + - '2.12' # Ansible-test on various stable branches does not yet work well with cgroups v2. # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04 # image for these stable branches. The list of branches where this is necessary will @@ -38,6 +39,7 @@ jobs: - name: Perform sanity testing uses: felixfontein/ansible-test-gh-action@main with: + ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }} ansible-core-version: stable-${{ matrix.ansible }} coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} pull-request-change-detection: 'true' @@ -62,6 +64,7 @@ jobs: - '2.9' - '2.10' - '2.11' + - '2.12' steps: - name: >- @@ -69,6 +72,7 @@ jobs: Ansible version ${{ matrix.ansible }} uses: felixfontein/ansible-test-gh-action@main with: + ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }} ansible-core-version: stable-${{ matrix.ansible }} coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} pull-request-change-detection: 'true' @@ -162,7 +166,31 @@ jobs: docker: default python: '3.8' target: shippable/cloud/group1/ - + # 2.12 + - ansible: '2.12' + docker: centos6 + python: '' + target: shippable/posix/group1/ + - ansible: '2.12' + docker: fedora33 + python: '' + target: shippable/posix/group1/ + - ansible: '2.12' + docker: opensuse15 + python: '' + target: shippable/posix/group1/ + - ansible: '2.12' + docker: ubuntu2004 + python: '' + target: shippable/posix/group1/ + - ansible: '2.12' + docker: default + python: '2.6' + target: shippable/cloud/group1/ + - ansible: '2.12' + docker: default + python: '3.9' + target: shippable/cloud/group1/ steps: - name: >- Perform integration testing against @@ -170,6 +198,7 @@ jobs: under Python ${{ matrix.python }} uses: felixfontein/ansible-test-gh-action@main with: + ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }} ansible-core-version: stable-${{ matrix.ansible }} coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} docker-image: ${{ matrix.docker }}