From f7945c4bc9b5f976bc5e64c16ce0777027db0f6d Mon Sep 17 00:00:00 2001
From: Hideki Saito <saito@fgrep.org>
Date: Mon, 1 Jun 2026 19:34:12 +0900
Subject: [PATCH] [CI] AZP bump test container version to 8.0.0 (#751)

- Bump test container version to 8.0.0 for Ansible Core 2.18+
- Keep using 7.0.0 for Ansible Core 2.16 and 2.17. Both versions don't support Python3.13.

Signed-off-by: Hideki Saito <saito@fgrep.org>
---
 .azure-pipelines/azure-pipelines.yml                  | 9 ++++++++-
 .azure-pipelines/templates/matrix.yml                 | 7 +++++++
 .azure-pipelines/templates/test.yml                   | 8 +++++++-
 changelogs/fragments/751_ci_test_container_update.yml | 3 +++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/751_ci_test_container_update.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 96ea43e..cecbc0b 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -37,8 +37,9 @@ variables:
 resources:
   containers:
     - container: default
+      image: quay.io/ansible/azure-pipelines-test-container:8.0.0
+    - container: legacy
       image: quay.io/ansible/azure-pipelines-test-container:7.0.0
-
 pool: Standard
 
 stages:
@@ -128,6 +129,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           nameFormat: "{0}"
           testFormat: 2.17/{0}
           targets:
@@ -145,6 +147,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           nameFormat: "{0}"
           testFormat: 2.16/{0}
           targets:
@@ -237,6 +240,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           testFormat: 2.17/linux/{0}/1
           targets:
             - name: Fedora 39
@@ -250,6 +254,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           testFormat: 2.16/linux/{0}/1
           targets:
             - name: Fedora 38
@@ -347,6 +352,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           testFormat: 2.17/{0}/1
           targets:
             - name: RHEL 10.0
@@ -360,6 +366,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
+          container: legacy
           testFormat: 2.16/{0}/1
           targets:
             - name: RHEL 10.1
diff --git a/.azure-pipelines/templates/matrix.yml b/.azure-pipelines/templates/matrix.yml
index 4e9555d..061461f 100644
--- a/.azure-pipelines/templates/matrix.yml
+++ b/.azure-pipelines/templates/matrix.yml
@@ -14,6 +14,12 @@ parameters:
     type: object
     default: []
 
+  # An optional container resource name to use for the test jobs.
+  # Defaults to "default" if not specified.
+  - name: container
+    type: string
+    default: default
+
   # An optional format string used to generate the job name.
   # - {0} is the name of an item in the targets list.
   - name: nameFormat
@@ -43,6 +49,7 @@ parameters:
 jobs:
   - template: test.yml
     parameters:
+      container: ${{ parameters.container }}
       jobs:
         - ${{ if eq(length(parameters.groups), 0) }}:
           - ${{ each target in parameters.targets }}:
diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml
index 5250ed8..2c93c14 100644
--- a/.azure-pipelines/templates/test.yml
+++ b/.azure-pipelines/templates/test.yml
@@ -7,11 +7,17 @@ parameters:
   - name: jobs
     type: object
 
+  # An optional container resource name to use for the test jobs.
+  # Defaults to "default" if not specified.
+  - name: container
+    type: string
+    default: default
+
 jobs:
   - ${{ each job in parameters.jobs }}:
     - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
       displayName: ${{ job.name }}
-      container: default
+      container: ${{ parameters.container }}
       workspace:
         clean: all
       steps:
diff --git a/changelogs/fragments/751_ci_test_container_update.yml b/changelogs/fragments/751_ci_test_container_update.yml
new file mode 100644
index 0000000..1552723
--- /dev/null
+++ b/changelogs/fragments/751_ci_test_container_update.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - Update Azure Pipelines test container to 8.0.0 and use legacy container for ansible-core 2.16/2.17.