diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 33f6f6f6..b2d3179d 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -72,17 +72,6 @@ stages: test: '2.18/sanity/1' - name: Units test: '2.18/units/1' - - stage: Ansible_2_17 - displayName: Sanity & Units 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.17/sanity/1' - - name: Units - test: '2.17/units/1' ### Docker - stage: Docker_2_19 displayName: Docker 2.19 @@ -118,23 +107,6 @@ stages: groups: - 1 - 2 - - stage: Docker_2_17 - displayName: Docker 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.17/linux/{0} - targets: - - name: Fedora 39 - test: fedora39 - - name: Ubuntu 22.04 - test: ubuntu2204 - - name: Alpine 3.19 - test: alpine319 - groups: - - 1 - - 2 ### Community Docker - stage: Docker_community_2_19 @@ -212,21 +184,6 @@ stages: groups: - 1 - 2 - - stage: Remote_2_17 - displayName: Remote 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.17/{0} - targets: - - name: RHEL 9.3 - test: rhel/9.3 - - name: FreeBSD 13.5 - test: freebsd/13.5 - groups: - - 1 - - 2 ### Generic - stage: Generic_2_19 displayName: Generic 2.19 @@ -259,20 +216,6 @@ stages: groups: - 1 - 2 - - stage: Generic_2_17 - displayName: Generic 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.17/generic/{0} - targets: - - test: "3.7" - - test: "3.12" - groups: - - 1 - - 2 ## Finally @@ -281,17 +224,13 @@ stages: dependsOn: - Ansible_2_19 - Ansible_2_18 - - Ansible_2_17 - Remote_2_19_extra_vms - Remote_2_19 - Remote_2_18 - - Remote_2_17 - Docker_2_19 - Docker_2_18 - - Docker_2_17 - Docker_community_2_19 - Generic_2_19 - Generic_2_18 - - Generic_2_17 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index ef6e058c..f87e35b9 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -37,6 +37,7 @@ jobs: - '2.14' - '2.15' - '2.16' + - '2.17' runs-on: ubuntu-latest steps: - name: Perform sanity testing @@ -67,6 +68,7 @@ jobs: - '2.14' - '2.15' - '2.16' + - '2.17' steps: - name: >- @@ -316,6 +318,47 @@ jobs: docker: default python: '3.11' target: azp/generic/2/ + # 2.17 + - ansible: '2.17' + docker: fedora39 + python: '' + target: azp/posix/1/ + - ansible: '2.17' + docker: fedora39 + python: '' + target: azp/posix/2/ + - ansible: '2.17' + docker: ubuntu2204 + python: '' + target: azp/posix/1/ + - ansible: '2.17' + docker: ubuntu2204 + python: '' + target: azp/posix/2/ + - ansible: '2.17' + docker: alpine319 + python: '' + target: azp/posix/1/ + - ansible: '2.17' + docker: alpine319 + python: '' + target: azp/posix/2/ + - ansible: '2.17' + docker: default + python: '3.7' + target: azp/generic/1/ + - ansible: '2.17' + docker: default + python: '3.7' + target: azp/generic/2/ + - ansible: '2.17' + docker: default + python: '3.12' + target: azp/generic/1/ + - ansible: '2.17' + docker: default + python: '3.12' + target: azp/generic/2/ steps: - name: >-