Skip to content

[Perf] Add vmImage back to common perf.yml #5531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikeharder merged 2 commits into from
Feb 21, 2023
Merged

[Perf] Add vmImage back to common perf.yml #5531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4835b5d
Add vmImage back to common perf.yml
mikeharder Feb 21, 2023
bdebba7
Add vmImage back to perf-automation pipeline
mikeharder Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions eng/common/pipelines/templates/jobs/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down Expand Up @@ -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 }}
Expand All @@ -82,6 +90,7 @@ jobs:
value: ''
pool:
name: $(Pool)
vmImage: $(OSVmImage)
steps:

- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
Expand All @@ -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
Expand Down
18 changes: 17 additions & 1 deletion tools/perf-automation/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down