From 93d0253292dc2e66432d96f047b66200a2d2e35b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 27 Mar 2023 10:04:36 -0700 Subject: [PATCH] Use variable instead of container resource in AZP (#80299) --- .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 fc68e9864b5..425d6d0bbe8 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -30,11 +30,8 @@ variables: value: .azure-pipelines/commands/entry-point.sh - name: fetchDepth value: 500 - -resources: - containers: - - container: default - image: quay.io/ansible/azure-pipelines-test-container:3.0.0 + - name: defaultContainer + value: quay.io/ansible/azure-pipelines-test-container:3.0.0 pool: Standard diff --git a/.azure-pipelines/templates/coverage.yml b/.azure-pipelines/templates/coverage.yml index 469ed5e65d6..b518df280c2 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 d6a4d5a8b00..3df72632a8c 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(replace(job.test, '/', '_'), '.', '_'), '-', '_'), '@', '_') }} displayName: ${{ job.name }} - container: default + container: $[ variables.defaultContainer ] workspace: clean: all steps: