diff options
| author | Matt Clay <matt@mystile.com> | 2023-03-27 12:42:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 12:42:20 -0700 |
| commit | 60b0bcbf526ee2719fcc96c37f6c75dc1598d7db (patch) | |
| tree | f1bbfcd4e341558d7bac2387483e42fba49e9733 | |
| parent | a2497af80240b9352ecf5ab20145ba896f766e52 (diff) | |
| download | ansible-60b0bcbf526ee2719fcc96c37f6c75dc1598d7db.tar.gz | |
[stable-2.14] Use variable instead of container resource in AZP (#80299) (#80316)
(cherry picked from commit 93d0253292dc2e66432d96f047b66200a2d2e35b)
| -rw-r--r-- | .azure-pipelines/azure-pipelines.yml | 7 | ||||
| -rw-r--r-- | .azure-pipelines/templates/coverage.yml | 2 | ||||
| -rw-r--r-- | .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 16f238de03..b379c92e01 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 469ed5e65d..b518df280c 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 d6a4d5a8b0..3df72632a8 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: |