[Perf] Add parameter TimeoutInMinutes, update pools (#5456)

Azure · Feb 15, 2023 · 8f4c086 · 8f4c086
1 parent 18d81c0
commit 8f4c086
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 29 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

diff --git a/tools/perf-automation/tests.yml b/tools/perf-automation/tests.yml
@@ -94,6 +94,9 @@ parameters:
 - name: WindowsPool
   type: string
   default: 'azsdk-pool-mms-win-2022-general'
+- name: TimeoutInMinutes
+  type: number
+  default: '360'
 
 resources:
   repositories:
@@ -124,8 +127,6 @@ resources:
     ref: main
 
 variables:
-  LinuxVmImage: MMSUbuntu22.04
-  WindowsVmImage: 'MMS2022'
   ToolsRepoCommitish: $(Build.SourceVersion)
 
 stages:
@@ -136,10 +137,9 @@ stages:
     - template: /eng/common/pipelines/templates/jobs/perf.yml
       parameters:
         JobName: 'Perf_Net'
+        TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
-        LinuxVmImage: $(LinuxVmImage)
         WindowsPool: ${{ parameters.WindowsPool }}
-        WindowsVmImage: $(WindowsVmImage)
         Language: 'Net'
         LanguageVersion: ${{ parameters.NetLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-net'
@@ -164,10 +164,9 @@ stages:
     - template: /eng/common/pipelines/templates/jobs/perf.yml
       parameters:
         JobName: 'Perf_Java'
+        TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
-        LinuxVmImage: $(LinuxVmImage)
         WindowsPool: ${{ parameters.WindowsPool }}
-        WindowsVmImage: $(WindowsVmImage)
         Language: 'Java'
         LanguageVersion: ${{ parameters.JavaLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-java'
@@ -199,10 +198,9 @@ stages:
     - template: /eng/common/pipelines/templates/jobs/perf.yml
       parameters:
         JobName: 'Perf_JS'
+        TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
-        LinuxVmImage: $(LinuxVmImage)
         WindowsPool: ${{ parameters.WindowsPool }}
-        WindowsVmImage: $(WindowsVmImage)
         Language: 'JS'
         LanguageVersion: ${{ parameters.JSLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-js'
@@ -227,10 +225,9 @@ stages:
     - template: /eng/common/pipelines/templates/jobs/perf.yml
       parameters:
         JobName: 'Perf_Python'
+        TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
-        LinuxVmImage: $(LinuxVmImage)
         WindowsPool: ${{ parameters.WindowsPool }}
-        WindowsVmImage: $(WindowsVmImage)
         Language: 'Python'
         LanguageVersion: ${{ parameters.PythonLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-python'
@@ -258,10 +255,9 @@ stages:
     - template: /eng/common/pipelines/templates/jobs/perf.yml
       parameters:
         JobName: 'Perf_Cpp'
+        TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
-        LinuxVmImage: $(LinuxVmImage)
         WindowsPool: ${{ parameters.WindowsPool }}
-        WindowsVmImage: $(WindowsVmImage)
         Language: 'Cpp'
         LanguageVersion: 'N/A'
         LanguageRepoName: 'Azure/azure-sdk-for-cpp'
@@ -286,7 +282,6 @@ stages:
   displayName: Print Results
   pool:
     name: azsdk-pool-mms-ubuntu-2204-general
-    vmImage: MMSUbuntu22.04
   condition: succeededOrFailed()
   variables:
   - template: /eng/pipelines/templates/variables/globals.yml