Sync eng/common directory with azure-sdk-tools for PR 5456 (#2505)

* Add parameter TimeoutInMinutes * Update pools and images to latest * Remove all usage of vmImage --------- Co-authored-by: Mike Harder <[email protected]>
Azure · Feb 15, 2023 · cf6fa6f · cf6fa6f
1 parent fbfd67e
commit cf6fa6f
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml
@@ -2,18 +2,15 @@ parameters:
 - name: JobName
   type: string
   default: 'Perf'
+- name: TimeoutInMinutes
+  type: number
+  default: '360'
 - name: LinuxPool
   type: string
-  default: 'azsdk-pool-mms-ubuntu-2004-perf'
-- name: LinuxVmImage
-  type: string
-  default: 'MMSUbuntu20.04'
+  default: 'azsdk-pool-mms-ubuntu-2204-perf'
 - name: WindowsPool
   type: string
-  default: 'azsdk-pool-mms-win-2019-perf'
-- name: WindowsVmImage
-  type: string
-  default: 'MMS2019'
+  default: 'azsdk-pool-mms-win-2022-perf'
 - name: Language
   type: string
   default: ''
@@ -65,18 +62,16 @@ parameters:
 
 jobs:
 - job: ${{ parameters.JobName }}
-  timeoutInMinutes: 360
+  timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
   strategy:
     matrix:
       ${{ 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 }}
@@ -87,7 +82,6 @@ jobs:
       value: ''
   pool:
     name: $(Pool)
-    vmImage: $(OSVmImage)
   steps:
 
   - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
@@ -106,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