From 325cbfac731e11d44b526e2152e1ca9e51f27020 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 15 Oct 2025 14:13:42 +0200 Subject: [PATCH] Replace devel by stable-2.20. (#1169) --- .azure-pipelines/azure-pipelines.yml | 34 ++++++++++++++-------------- README.md | 2 +- antsibull-nox.toml | 26 +++++++++++---------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c85fa9fb..3a0e9bb9 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -52,17 +52,17 @@ pool: Standard stages: ### Sanity & units - - stage: Ansible_devel - displayName: Sanity & Units devel + - stage: Ansible_2_20 + displayName: Sanity & Units 2.20 dependsOn: [] jobs: - template: templates/matrix.yml parameters: targets: - name: Sanity - test: 'devel/sanity/1' + test: '2.20/sanity/1' - name: Units - test: 'devel/units/1' + test: '2.20/units/1' - stage: Ansible_2_19 displayName: Sanity & Units 2.19 dependsOn: [] @@ -98,13 +98,13 @@ stages: test: '2.17/units/1' ### Docker - - stage: Docker_devel - displayName: Docker devel + - stage: Docker_2_20 + displayName: Docker 2.20 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - testFormat: devel/linux/{0} + testFormat: 2.20/linux/{0} targets: - name: Fedora 42 test: fedora42 @@ -168,13 +168,13 @@ stages: - 5 ### Community Docker - - stage: Docker_community_devel - displayName: Docker (community images) devel + - stage: Docker_community_2_20 + displayName: Docker (community images) 2.20 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - testFormat: devel/linux-community/{0} + testFormat: 2.20/linux-community/{0} targets: - name: Debian 11 Bullseye test: debian-bullseye/3.9 @@ -189,13 +189,13 @@ stages: - 5 ### Remote - - stage: Remote_devel - displayName: Remote devel + - stage: Remote_2_20 + displayName: Remote 2.20 dependsOn: [] jobs: - template: templates/matrix.yml parameters: - testFormat: devel/{0} + testFormat: 2.20/{0} targets: - name: RHEL 10.0 test: rhel/10.0 @@ -266,18 +266,18 @@ stages: - stage: Summary condition: succeededOrFailed() dependsOn: - - Ansible_devel + - Ansible_2_20 - Ansible_2_19 - Ansible_2_18 - Ansible_2_17 - - Remote_devel + - Remote_2_20 - Remote_2_19 - Remote_2_18 - Remote_2_17 - - Docker_devel + - Docker_2_20 - Docker_2_19 - Docker_2_18 - Docker_2_17 - - Docker_community_devel + - Docker_community_2_20 jobs: - template: templates/coverage.yml diff --git a/README.md b/README.md index aa910b57..35abb113 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ For more information about communication, see the [Ansible communication guide]( ## Tested with Ansible -Tested with the current ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, ansible-core 2.18, and ansible-core 2.19 releases, and the current development version of ansible-core. Ansible/ansible-base versions before 2.15.0 are not supported. +Tested with the current ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, ansible-core 2.18, ansible-core 2.19, and ansible-core 2.20 releases. Ansible/ansible-base versions before 2.15.0 are not supported. ## External requirements diff --git a/antsibull-nox.toml b/antsibull-nox.toml index 827531f2..7afa440f 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -80,10 +80,12 @@ skip_directories = [ run_galaxy_importer = true [sessions.ansible_test_sanity] -include_devel = true +include_devel = false +max_version = "2.20" [sessions.ansible_test_units] -include_devel = true +include_devel = false +max_version = "2.20" [sessions.ansible_test_integration] session_name_template = "ansible-test-integration-{ansible_core}{dash_docker_short}{dash_remote}{dash_python_version}{dash_target_dashized}" @@ -183,49 +185,49 @@ ansible_core = "2.19" target = [ "azp/1/", "azp/2/", "azp/3/", "azp/4/", "azp/5/" ] remote = [ "rhel/9.5", "ubuntu/22.04" ] -# Ansible-core devel: +# Ansible-core 2.20: [[sessions.ansible_test_integration.groups]] -session_name = "ansible-test-integration-devel" -description = "Meta session for running all ansible-test-integration-devel-* sessions." +session_name = "ansible-test-integration-2.20" +description = "Meta session for running all ansible-test-integration-2.20-* sessions." [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/4/", "azp/5/" ] docker = [ "fedora42", "ubuntu2204", "ubuntu2404", "alpine322" ] [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/4/", "azp/5/" ] python_version = "3.9" docker = "quay.io/ansible-community/test-image:debian-bullseye" [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/4/", "azp/5/" ] python_version = "3.11" docker = "quay.io/ansible-community/test-image:debian-bookworm" [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/4/", "azp/5/" ] python_version = "3.13" docker = "quay.io/ansible-community/test-image:debian-13-trixie" [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/4/", "azp/5/" ] python_version = "3.13" docker = "quay.io/ansible-community/test-image:archlinux" [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/1/", "azp/2/", "azp/3/", "azp/4/", "azp/5/" ] remote = [ "rhel/9.6" ] ansible_vars = { force_docker_sdk_for_python_dev = { type = "value", value = true, template_value = "sdk-dev-latest" } } [[sessions.ansible_test_integration.groups.sessions]] -ansible_core = "devel" +ansible_core = "2.20" target = [ "azp/1/", "azp/2/", "azp/3/", "azp/4/", "azp/5/" ] remote = [ "rhel/10.0",