From 97fa83ee0384be674d4f9d6d89fcbcbe09e13fe7 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 5 Jun 2026 09:21:35 +0200
Subject: [PATCH] CI: Move ansible-core 2.18 completely to GHA (#1277)

* Move ansible-core 2.18 completely to GHA.

* Shorten group names.
---
 .azure-pipelines/azure-pipelines.yml | 29 ++++------------------------
 noxfile.py                           |  2 +-
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index f710e581..5d1cd358 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -49,28 +49,8 @@ resources:
 pool: Standard
 
 stages:
-  - stage: remote_2_18
-    displayName: Remote ansible-core 2.18
-    dependsOn: []
-    variables:
-      entryPoint: tests/utils/shippable/nox.sh
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: RHEL 9.7 + group 1
-              test: ansible-test-integration-2.18-rhel-9.7-azp-1
-            - name: RHEL 9.7 + group 2
-              test: ansible-test-integration-2.18-rhel-9.7-azp-2
-            - name: RHEL 9.7 + group 3
-              test: ansible-test-integration-2.18-rhel-9.7-azp-3
-            - name: RHEL 9.7 + group 4
-              test: ansible-test-integration-2.18-rhel-9.7-azp-4
-            - name: RHEL 9.7 + group 5
-              test: ansible-test-integration-2.18-rhel-9.7-azp-5
-
   - stage: remote_2_19
-    displayName: Remote ansible-core 2.19
+    displayName: Remote 2.19
     dependsOn: []
     variables:
       entryPoint: tests/utils/shippable/nox.sh
@@ -90,7 +70,7 @@ stages:
               test: ansible-test-integration-2.19-ubuntu-22.04-azp-5
 
   - stage: remote_2_20
-    displayName: Remote ansible-core 2.20
+    displayName: Remote 2.20
     dependsOn: []
     variables:
       entryPoint: tests/utils/shippable/nox.sh
@@ -110,7 +90,7 @@ stages:
               test: ansible-test-integration-2.20-rhel-9.7-azp-5
 
   - stage: remote_2_21
-    displayName: Remote ansible-core 2.21
+    displayName: Remote 2.21
     dependsOn: []
     variables:
       entryPoint: tests/utils/shippable/nox.sh
@@ -130,7 +110,7 @@ stages:
               test: ansible-test-integration-2.21-rhel-10.1-azp-5
 
   - stage: remote_devel
-    displayName: Remote ansible-core devel
+    displayName: Remote devel
     dependsOn: []
     variables:
       entryPoint: tests/utils/shippable/nox.sh
@@ -162,7 +142,6 @@ stages:
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
-      - remote_2_18
       - remote_2_19
       - remote_2_20
       - remote_2_21
diff --git a/noxfile.py b/noxfile.py
index 3f21d361..637f3b7b 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -29,7 +29,7 @@ def update_azp_config(session: nox.Session) -> None:
         "--exclude-tags",
         "docker",
         "--min-ansible-core",
-        "2.18",
+        "2.19",
     ]
     if antsibull_nox.IN_CI:
         command.append("--fail-on-change")