From 0083bdaa41fae3513b9895c2a27df69d987ce28c Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 22:55:31 -0500 Subject: [PATCH 1/6] Add ansible-core stable-2.22 to CI matrices Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ansible-test-windows.yml | 3 ++- .github/workflows/ansible-test.yml | 2 ++ README.md | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 4da38557..cf0f79d8 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -84,6 +84,7 @@ jobs: - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel python: - python3 @@ -180,7 +181,7 @@ jobs: # which isn't packaged in the Ubuntu-24.04 WSL image used here (default python3 is 3.12). # actions/setup-python only provisions the Windows host, not this WSL guest, so install a # standalone Python 3.13 via uv for that leg instead of an apt/PPA install. - - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.19, stable-2.20, devel) + - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.19, stable-2.20, stable-2.21, stable-2.22, devel) run: | PYTHON_BIN=python3 if [ "${{ matrix.ansible }}" = "devel" ]; then diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 3a8d9698..0e622762 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -65,6 +65,7 @@ jobs: - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel runs-on: ubuntu-latest steps: @@ -182,6 +183,7 @@ jobs: - stable-2.19 - stable-2.20 - stable-2.21 + - stable-2.22 - devel python: - 3.10 diff --git a/README.md b/README.md index adcab67b..b068593a 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ To learn how to maintain / become a maintainer of this collection, refer to the - 2.19 - 2.20 - 2.21 +- 2.22 - devel ### SQL Server From 8fe65fc7bf81201abca58db39db701ff167aa62f Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 22:56:04 -0500 Subject: [PATCH 2/6] Drop ansible-core 2.19 from CI matrices Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ansible-test-windows.yml | 3 +-- .github/workflows/ansible-test.yml | 2 -- README.md | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index cf0f79d8..18dbc866 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -81,7 +81,6 @@ jobs: wsl: - Ubuntu-24.04 ansible: - - stable-2.19 - stable-2.20 - stable-2.21 - stable-2.22 @@ -181,7 +180,7 @@ jobs: # which isn't packaged in the Ubuntu-24.04 WSL image used here (default python3 is 3.12). # actions/setup-python only provisions the Windows host, not this WSL guest, so install a # standalone Python 3.13 via uv for that leg instead of an apt/PPA install. - - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.19, stable-2.20, stable-2.21, stable-2.22, devel) + - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.20, stable-2.21, stable-2.22, devel) run: | PYTHON_BIN=python3 if [ "${{ matrix.ansible }}" = "devel" ]; then diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 0e622762..423a93a6 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -62,7 +62,6 @@ jobs: ansible: # It's important that Sanity is tested against all stable-X.Y branches # Testing against `devel` may fail as new tests are added. - - stable-2.19 - stable-2.20 - stable-2.21 - stable-2.22 @@ -180,7 +179,6 @@ jobs: fail-fast: false matrix: ansible: - - stable-2.19 - stable-2.20 - stable-2.21 - stable-2.22 diff --git a/README.md b/README.md index b068593a..a5f448d2 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,6 @@ To learn how to maintain / become a maintainer of this collection, refer to the ## Tested with ### Ansible - -- 2.19 - 2.20 - 2.21 - 2.22 From 07a4ed1f0a4852e0f9d7a95ba292bef2036c8fab Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 23:00:49 -0500 Subject: [PATCH 3/6] Use Python 3.13 for stable-2.22 Windows integration job Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ansible-test-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 18dbc866..2bb6200d 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -176,14 +176,14 @@ jobs: # Override break-sys-pkg defaults, because we don't need to bother with python venv for CI # - # ansible-core devel requires Python >= 3.13 (see pyproject.toml on the devel branch), + # ansible-core devel and stable-2.22 require Python >= 3.13 (see pyproject.toml on those branches), # which isn't packaged in the Ubuntu-24.04 WSL image used here (default python3 is 3.12). # actions/setup-python only provisions the Windows host, not this WSL guest, so install a # standalone Python 3.13 via uv for that leg instead of an apt/PPA install. - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.20, stable-2.21, stable-2.22, devel) run: | PYTHON_BIN=python3 - if [ "${{ matrix.ansible }}" = "devel" ]; then + if [ "${{ matrix.ansible }}" = "devel" ] || [ "${{ matrix.ansible }}" = "stable-2.22" ]; then curl -LsSf https://astral.sh/uv/install.sh | sh "$HOME/.local/bin/uv" python install 3.13 PYTHON_BIN="$("$HOME/.local/bin/uv" python find 3.13)" @@ -191,7 +191,7 @@ jobs: "$PYTHON_BIN" -m pip config set global.break-system-packages true "$PYTHON_BIN" -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 "$PYTHON_BIN" -m pip install "https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz" --disable-pip-version-check --retries 10 - if [ "${{ matrix.ansible }}" = "devel" ]; then + if [ "${{ matrix.ansible }}" = "devel" ] || [ "${{ matrix.ansible }}" = "stable-2.22" ]; then # uv's standalone Python isn't on PATH, and its console scripts don't land in # /usr/local/bin like the system python3 case does, so symlink them there for later # wsl-bash steps (each one is a fresh --norc/--noprofile shell, nothing persists). From ea4278b19d3f1cb4c0a0d040ef1da9cb20609fa8 Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 23:01:08 -0500 Subject: [PATCH 4/6] Raise integration test Python floor to 3.11 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ansible-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 423a93a6..fc26d0e5 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -184,7 +184,7 @@ jobs: - stable-2.22 - devel python: - - 3.10 + - 3.11 steps: - name: Check out code From 031ed123db6b19fbb894b09031306aa9d861d63c Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 23:02:37 -0500 Subject: [PATCH 5/6] Default Windows integration jobs to uv Python 3.13, exempt older cores Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ansible-test-windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ansible-test-windows.yml b/.github/workflows/ansible-test-windows.yml index 2bb6200d..3345063e 100644 --- a/.github/workflows/ansible-test-windows.yml +++ b/.github/workflows/ansible-test-windows.yml @@ -176,14 +176,16 @@ jobs: # Override break-sys-pkg defaults, because we don't need to bother with python venv for CI # - # ansible-core devel and stable-2.22 require Python >= 3.13 (see pyproject.toml on those branches), + # ansible-core 2.22 and newer (including devel) require Python >= 3.13 (see pyproject.toml on those branches), # which isn't packaged in the Ubuntu-24.04 WSL image used here (default python3 is 3.12). # actions/setup-python only provisions the Windows host, not this WSL guest, so install a - # standalone Python 3.13 via uv for that leg instead of an apt/PPA install. + # standalone Python 3.13 via uv for those legs instead of an apt/PPA install. - name: Install ansible-base (${{ matrix.ansible }}) # zizmor: ignore[template-injection] -- matrix.ansible is a controlled enum value (stable-2.20, stable-2.21, stable-2.22, devel) run: | PYTHON_BIN=python3 - if [ "${{ matrix.ansible }}" = "devel" ] || [ "${{ matrix.ansible }}" = "stable-2.22" ]; then + USE_UV_PYTHON=true + case "${{ matrix.ansible }}" in stable-2.20|stable-2.21) USE_UV_PYTHON=false ;; esac + if [ "$USE_UV_PYTHON" = true ]; then curl -LsSf https://astral.sh/uv/install.sh | sh "$HOME/.local/bin/uv" python install 3.13 PYTHON_BIN="$("$HOME/.local/bin/uv" python find 3.13)" @@ -191,7 +193,7 @@ jobs: "$PYTHON_BIN" -m pip config set global.break-system-packages true "$PYTHON_BIN" -m pip install --upgrade setuptools pypsrp --disable-pip-version-check --retries 10 "$PYTHON_BIN" -m pip install "https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz" --disable-pip-version-check --retries 10 - if [ "${{ matrix.ansible }}" = "devel" ] || [ "${{ matrix.ansible }}" = "stable-2.22" ]; then + if [ "$USE_UV_PYTHON" = true ]; then # uv's standalone Python isn't on PATH, and its console scripts don't land in # /usr/local/bin like the system python3 case does, so symlink them there for later # wsl-bash steps (each one is a fresh --norc/--noprofile shell, nothing persists). From 8d741c6fbfe5d83156434f13e8d066337303a5f4 Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 6 Nov 2026 23:27:16 -0500 Subject: [PATCH 6/6] Add changelog fragment for ansible-core 2.22 CI Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- changelogs/fragments/383-ansible-core-2-22-ci.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/383-ansible-core-2-22-ci.yml diff --git a/changelogs/fragments/383-ansible-core-2-22-ci.yml b/changelogs/fragments/383-ansible-core-2-22-ci.yml new file mode 100644 index 00000000..99f6a10e --- /dev/null +++ b/changelogs/fragments/383-ansible-core-2-22-ci.yml @@ -0,0 +1,3 @@ +--- +trivial: + - CI - added ansible-core ``stable-2.22`` to the sanity, integration, and Windows integration test matrices, dropped ``stable-2.19`` (EOL 2026-11-30), and raised the integration test Python version to 3.11.