From cb1bf979343eeaa1f7f2022c311e5c95efffd2a3 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 19 Apr 2023 23:52:30 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 6004 (#25598) Sync eng/common directory with azure-sdk-tools for PR https://github.com/Azure/azure-sdk-tools/pull/6004 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow) Co-authored-by: Konrad Jamrozik --- .../pipelines/templates/jobs/archetype-sdk-tests-generate.yml | 2 +- eng/common/pipelines/templates/jobs/prepare-pipelines.yml | 2 +- .../pipelines/templates/stages/archetype-sdk-tool-pwsh.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml index 5c24c5d0d86f..afc5de87ce1f 100644 --- a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml +++ b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml @@ -30,7 +30,7 @@ parameters: default: azsdk-pool-mms-ubuntu-2204-general - name: OsVmImage type: string - default: MMSUbuntu22.04 + default: ubuntu-22.04 # This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE. # When that occurs, provide a name other than the default value. - name: GenerateJobName diff --git a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml index 3bdd537ed7e3..424f587ae126 100644 --- a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml +++ b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml @@ -21,7 +21,7 @@ jobs: - job: PreparePipelines pool: name: azsdk-pool-mms-ubuntu-2204-general - vmImage: MMSUbuntu22.04 + vmImage: ubuntu-22.04 steps: - template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml - template: /eng/common/pipelines/templates/steps/set-default-branch.yml diff --git a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml index 5d78b132e26d..a2d51dd1d215 100644 --- a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml +++ b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml @@ -26,7 +26,7 @@ stages: Image: windows-2022 Linux: Pool: azsdk-pool-mms-ubuntu-2204-general - Image: MMSUbuntu22.04 + Image: ubuntu-22.04 Mac: Pool: Azure Pipelines Image: macos-11