From d120d89e8833bfdeea224fff341f072a21ce96e1 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 14 Feb 2023 19:47:36 -0800 Subject: [PATCH 1/3] Add parameter TimeoutInMinutes --- eng/common/pipelines/templates/jobs/perf.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index ff2d53162558..250ba17f5cbb 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -2,6 +2,9 @@ parameters: - name: JobName type: string default: 'Perf' +- name: TimeoutInMinutes + type: number + default: '360' - name: LinuxPool type: string default: 'azsdk-pool-mms-ubuntu-2004-perf' @@ -65,7 +68,7 @@ parameters: jobs: - job: ${{ parameters.JobName }} - timeoutInMinutes: 360 + timeoutInMinutes: ${{ parameters.TimeoutInMinutes }} strategy: matrix: ${{ if contains(parameters.OperatingSystems, 'Linux') }}: From cd1ee6189e11630174de9c3e00b7337d6071141e Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 14 Feb 2023 20:01:24 -0800 Subject: [PATCH 2/3] Update pools and images to latest --- eng/common/pipelines/templates/jobs/perf.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 250ba17f5cbb..de259ea80ee3 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -7,16 +7,16 @@ parameters: default: '360' - name: LinuxPool type: string - default: 'azsdk-pool-mms-ubuntu-2004-perf' + default: 'azsdk-pool-mms-ubuntu-2204-perf' - name: LinuxVmImage type: string - default: 'MMSUbuntu20.04' + default: 'MMSUbuntu22.04Compliant' - name: WindowsPool type: string - default: 'azsdk-pool-mms-win-2019-perf' + default: 'azsdk-pool-mms-win-2022-perf' - name: WindowsVmImage type: string - default: 'MMS2019' + default: 'MMS2022Compliant' - name: Language type: string default: '' From 42f341d5c3f77de09ca2e228aa2dfd3bff5131aa Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 14 Feb 2023 22:47:57 -0800 Subject: [PATCH 3/3] Remove all usage of vmImage --- eng/common/pipelines/templates/jobs/perf.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index de259ea80ee3..073e5de641cb 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -8,15 +8,9 @@ parameters: - name: LinuxPool type: string default: 'azsdk-pool-mms-ubuntu-2204-perf' -- name: LinuxVmImage - type: string - default: 'MMSUbuntu22.04Compliant' - name: WindowsPool type: string default: 'azsdk-pool-mms-win-2022-perf' -- name: WindowsVmImage - type: string - default: 'MMS2022Compliant' - name: Language type: string default: '' @@ -74,12 +68,10 @@ 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 }} @@ -90,7 +82,6 @@ jobs: value: '' pool: name: $(Pool) - vmImage: $(OSVmImage) steps: - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml @@ -109,10 +100,6 @@ 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