From 214819df32b0e110485888a181109ae3f6a43fe8 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 21 Apr 2023 13:55:05 -0700
Subject: [stable-2.9] Use variable instead of container resource in AZP
 (#80299). (#80602)

(cherry picked from commit 93d0253292dc2e66432d96f047b66200a2d2e35b)
---
 .azure-pipelines/azure-pipelines.yml    | 7 ++-----
 .azure-pipelines/templates/coverage.yml | 2 +-
 .azure-pipelines/templates/test.yml     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 2a13f69858..ea43e63d3b 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -32,11 +32,8 @@ variables:
     value: test/utils/shippable/shippable.sh
   - name: fetchDepth
     value: 500
-
-resources:
-  containers:
-    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
+  - name: defaultContainer
+    value: quay.io/ansible/azure-pipelines-test-container:1.9.0
 
 pool: Legacy
 
diff --git a/.azure-pipelines/templates/coverage.yml b/.azure-pipelines/templates/coverage.yml
index 1b36ea45a4..79d5232117 100644
--- a/.azure-pipelines/templates/coverage.yml
+++ b/.azure-pipelines/templates/coverage.yml
@@ -6,7 +6,7 @@
 jobs:
   - job: Coverage
     displayName: Code Coverage
-    container: default
+    container: $[ variables.defaultContainer ]
     workspace:
       clean: all
     steps:
diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml
index 5250ed8023..708251f11e 100644
--- a/.azure-pipelines/templates/test.yml
+++ b/.azure-pipelines/templates/test.yml
@@ -11,7 +11,7 @@ jobs:
   - ${{ each job in parameters.jobs }}:
     - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
       displayName: ${{ job.name }}
-      container: default
+      container: $[ variables.defaultContainer ]
       workspace:
         clean: all
       steps:
-- 
cgit v1.2.1