From cdc5f469eeb7933f81ad3581679cb271bcde519b Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 21 Feb 2023 13:09:53 -0800 Subject: [PATCH] Add vmImage back to common perf.yml - Fixes #5466 - Partially reverts #5456 --- eng/common/pipelines/templates/jobs/perf.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 073e5de641cb..d1204f284ceb 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -8,9 +8,15 @@ parameters: - name: LinuxPool type: string default: 'azsdk-pool-mms-ubuntu-2204-perf' +- name: LinuxVmImage + type: string + default: 'ubuntu-22.04' - name: WindowsPool type: string default: 'azsdk-pool-mms-win-2022-perf' +- name: WindowsVmImage + type: string + default: 'windows-2022' - name: Language type: string default: '' @@ -68,10 +74,12 @@ jobs: ${{ if contains(parameters.OperatingSystems, 'Linux') }}: Linux: Pool: ${{ parameters.LinuxPool }} + OsVmImage: ${{ parameters.LinuxVmImage }} MatrixName: 'Linux' ${{ if contains(parameters.OperatingSystems, 'Windows') }}: Windows: Pool: ${{ parameters.WindowsPool }} + OsVmImage: ${{ parameters.WindowsVmImage }} MatrixName: 'Windows' variables: - ${{ parameters.Variables }} @@ -82,6 +90,7 @@ jobs: value: '' pool: name: $(Pool) + vmImage: $(OSVmImage) steps: - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml @@ -100,6 +109,10 @@ jobs: Commitish: ${{ parameters.ToolsRepoCommitish }} WorkingDirectory: $(System.DefaultWorkingDirectory)/azure-sdk-tools + - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml + parameters: + AgentImage: $(OSVmImage) + - ${{ parameters.InstallLanguageSteps }} - template: /eng/common/TestResources/deploy-test-resources.yml