From 4835b5d6837b37dfcfe2b1280778c4fd21f185cd Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Tue, 21 Feb 2023 13:09:53 -0800
Subject: [PATCH 1/2] 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 073e5de641c..d1204f284ce 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

From bdebba7fad6063724e9a73b6ba5f1ced29a3c26f Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Tue, 21 Feb 2023 13:15:28 -0800
Subject: [PATCH 2/2] Add vmImage back to perf-automation pipeline

---
 tools/perf-automation/tests.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/perf-automation/tests.yml b/tools/perf-automation/tests.yml
index aacdd86af50..4dc6c31af1d 100644
--- a/tools/perf-automation/tests.yml
+++ b/tools/perf-automation/tests.yml
@@ -90,10 +90,16 @@ parameters:
   # Use general pools instead of perf pools for faster startup due to more warm agents
 - name: LinuxPool
   type: string
-  default: azsdk-pool-mms-ubuntu-2204-general
+  default: 'azsdk-pool-mms-ubuntu-2204-general'
+- name: LinuxVmImage
+  type: string
+  default: 'ubuntu-22.04'
 - name: WindowsPool
   type: string
   default: 'azsdk-pool-mms-win-2022-general'
+- name: WindowsVmImage
+  type: string
+  default: 'windows-2022'
 - name: TimeoutInMinutes
   type: number
   default: '360'
@@ -139,7 +145,9 @@ stages:
         JobName: 'Perf_Net'
         TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
+        LinuxVmImage: ${{ parameters.LinuxVmImage }}
         WindowsPool: ${{ parameters.WindowsPool }}
+        WindowsVmImage: ${{ parameters.WindowsVmImage }}
         Language: 'Net'
         LanguageVersion: ${{ parameters.NetLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-net'
@@ -166,7 +174,9 @@ stages:
         JobName: 'Perf_Java'
         TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
+        LinuxVmImage: ${{ parameters.LinuxVmImage }}
         WindowsPool: ${{ parameters.WindowsPool }}
+        WindowsVmImage: ${{ parameters.WindowsVmImage }}
         Language: 'Java'
         LanguageVersion: ${{ parameters.JavaLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-java'
@@ -200,7 +210,9 @@ stages:
         JobName: 'Perf_JS'
         TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
+        LinuxVmImage: ${{ parameters.LinuxVmImage }}
         WindowsPool: ${{ parameters.WindowsPool }}
+        WindowsVmImage: ${{ parameters.WindowsVmImage }}
         Language: 'JS'
         LanguageVersion: ${{ parameters.JSLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-js'
@@ -227,7 +239,9 @@ stages:
         JobName: 'Perf_Python'
         TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
+        LinuxVmImage: ${{ parameters.LinuxVmImage }}
         WindowsPool: ${{ parameters.WindowsPool }}
+        WindowsVmImage: ${{ parameters.WindowsVmImage }}
         Language: 'Python'
         LanguageVersion: ${{ parameters.PythonLanguageVersion }}
         LanguageRepoName: 'Azure/azure-sdk-for-python'
@@ -257,7 +271,9 @@ stages:
         JobName: 'Perf_Cpp'
         TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
         LinuxPool: ${{ parameters.LinuxPool }}
+        LinuxVmImage: ${{ parameters.LinuxVmImage }}
         WindowsPool: ${{ parameters.WindowsPool }}
+        WindowsVmImage: ${{ parameters.WindowsVmImage }}
         Language: 'Cpp'
         LanguageVersion: 'N/A'
         LanguageRepoName: 'Azure/azure-sdk-for-cpp'