From 50c2c4db29f2433d3d35d55f5011b33577a6c6a8 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 3 Apr 2024 08:32:16 +0200 Subject: [PATCH] CI: Add stable-2.17; copy ignore.txt files from 2.17 to 2.18; move stable-2.14 from AZP to GHA (#721) * Add stable-2.17 to CI; copy ignore files from 2.17 to 2.18. * Move stable-2.14 from AZP to GHA. --- .azure-pipelines/azure-pipelines.yml | 115 +++++++++++++-------------- .github/workflows/ansible-test.yml | 19 +++++ README.md | 2 +- tests/sanity/ignore-2.18.txt | 2 + tests/sanity/ignore-2.18.txt.license | 3 + 5 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 tests/sanity/ignore-2.18.txt create mode 100644 tests/sanity/ignore-2.18.txt.license diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index ab68ec70..975387ed 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -65,6 +65,17 @@ stages: test: 'devel/sanity/extra' - name: Units test: 'devel/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' - stage: Ansible_2_16 displayName: Sanity & Units 2.16 dependsOn: [] @@ -87,17 +98,6 @@ stages: test: '2.15/sanity/1' - name: Units test: '2.15/units/1' - - stage: Ansible_2_14 - displayName: Sanity & Units 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.14/sanity/1' - - name: Units - test: '2.14/units/1' ### Docker - stage: Docker_devel displayName: Docker devel @@ -116,6 +116,19 @@ 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: Alpine 3.19 + test: alpine319 + groups: + - 1 + - 2 - stage: Docker_2_16 displayName: Docker 2.16 dependsOn: [] @@ -148,19 +161,6 @@ stages: groups: - 1 - 2 - - stage: Docker_2_14 - displayName: Docker 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/linux/{0} - targets: - - name: Ubuntu 20.04 - test: ubuntu2004 - groups: - - 1 - - 2 ### Community Docker - stage: Docker_community_devel @@ -210,13 +210,24 @@ stages: test: macos/14.3 - name: RHEL 9.3 test: rhel/9.3 - - name: FreeBSD 13.3 - test: freebsd/13.3 - name: FreeBSD 14.0 test: freebsd/14.0 groups: - 1 - 2 + - stage: Remote_2_17 + displayName: Remote 2.17 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.17/{0} + targets: + - name: FreeBSD 13.3 + test: freebsd/13.3 + groups: + - 1 + - 2 - stage: Remote_2_16 displayName: Remote 2.16 dependsOn: [] @@ -257,23 +268,6 @@ stages: groups: - 1 - 2 - - stage: Remote_2_14 - displayName: Remote 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/{0} - targets: - #- name: macOS 12.0 - # test: macos/12.0 - - name: RHEL 9.0 - test: rhel/9.0 - #- name: FreeBSD 12.4 - # test: freebsd/12.4 - groups: - - 1 - - 2 ### Generic - stage: Generic_devel displayName: Generic devel @@ -293,6 +287,20 @@ 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 - stage: Generic_2_16 displayName: Generic 2.16 dependsOn: [] @@ -322,19 +330,6 @@ stages: groups: - 1 - 2 - - stage: Generic_2_14 - displayName: Generic 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.14/generic/{0} - targets: - - test: 3.9 - groups: - - 1 - - 2 ## Finally @@ -342,22 +337,22 @@ stages: condition: succeededOrFailed() dependsOn: - Ansible_devel + - Ansible_2_17 - Ansible_2_16 - Ansible_2_15 - - Ansible_2_14 - Remote_devel_extra_vms - Remote_devel + - Remote_2_17 - Remote_2_16 - Remote_2_15 - - Remote_2_14 - Docker_devel + - Docker_2_17 - Docker_2_16 - Docker_2_15 - - Docker_2_14 - Docker_community_devel - Generic_devel + - Generic_2_17 - Generic_2_16 - Generic_2_15 - - Generic_2_14 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index be831028..d31e861c 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -34,6 +34,7 @@ jobs: - '2.11' - '2.12' - '2.13' + - '2.14' # 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 @@ -74,6 +75,7 @@ jobs: - '2.11' - '2.12' - '2.13' + - '2.14' steps: - name: >- @@ -253,6 +255,23 @@ jobs: docker: default python: '3.8' target: azp/generic/2/ + # 2.14 + - ansible: '2.14' + docker: ubuntu2004 + python: '' + target: azp/posix/1/ + - ansible: '2.14' + docker: ubuntu2004 + python: '' + target: azp/posix/2/ + - ansible: '2.14' + docker: default + python: '3.9' + target: azp/generic/1/ + - ansible: '2.14' + docker: default + python: '3.9' + target: azp/generic/2/ steps: - name: >- diff --git a/README.md b/README.md index 64ffd4ea..96f3acbf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Please note that this collection does **not** support Windows targets. ## Tested with Ansible -Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, and ansible-core-2.16 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. +Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, ansible-core 2.16, and ansible-core-2.17 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. ## External requirements diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt new file mode 100644 index 00000000..9ffe1e99 --- /dev/null +++ b/tests/sanity/ignore-2.18.txt @@ -0,0 +1,2 @@ +tests/ee/roles/smoke/library/smoke_ipaddress.py shebang +tests/ee/roles/smoke/library/smoke_pyyaml.py shebang diff --git a/tests/sanity/ignore-2.18.txt.license b/tests/sanity/ignore-2.18.txt.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/sanity/ignore-2.18.txt.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project