Skip to content

[EngSys] Update agent pool to "azsdk-pool" #3321

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
qiaozha merged 10 commits into from
Jun 24, 2025
Merged

[EngSys] Update agent pool to "azsdk-pool" #3321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31302b7
[EngSys] Update agent pool to "azsdk-pool"
mikeharder Jun 24, 2025
695368e
Fix demands
mikeharder Jun 24, 2025
df7910c
remove unnecessary coalesce of OSVmImage
mikeharder Jun 24, 2025
070cbb5
Fix mac pools
mikeharder Jun 24, 2025
0290cf7
try setting vmImage and demands to empty string
mikeharder Jun 24, 2025
dff4544
fix mac matrixes
mikeharder Jun 24, 2025
d0a1a90
Merge branch 'main' into azsdk-pool
mikeharder Jun 24, 2025
12e9dd7
set --no-sandbox in chrome tests
mikeharder Jun 24, 2025
93af30e
Merge branch 'azsdk-pool' of https://github.com/mikeharder/autorest.t…
mikeharder Jun 24, 2025
5670b25
comment
mikeharder Jun 24, 2025
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
48 changes: 30 additions & 18 deletions .scripts/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@ trigger:
parameters:
- name: LinuxPool
type: string
default: azsdk-pool-mms-ubuntu-2004-general
default: azsdk-pool
- name: WindowsPool
type: string
default: azsdk-pool
- name: MacPool
type: string
default: Azure Pipelines
- name: IncludeRelease
type: boolean
default: true
- name: OSVmImage
type: string
default: ubuntu-20.04
default: ubuntu-24.04
- name: Windows_Latest
type: string
default: "Windows-latest"
default: "windows-2022"

variables:
AUTOREST_TESTSERVER_COVERAGE_DIRECTORY: "$(Build.SourcesDirectory)/packages/autorest.typescript/coverage/"
Expand All @@ -28,7 +34,7 @@ stages:
- job: Build
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals ${{ parameters.OSVmImage }}
steps:
- template: build.yml
- script: |
Expand Down Expand Up @@ -120,11 +126,11 @@ stages:
matrix:
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
demands: ImageOverride -equals $(OSVmImage)
steps:
- template: build.yml
- script: npm run generate-swaggers
Expand All @@ -142,11 +148,11 @@ stages:
matrix:
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
demands: ImageOverride -equals $(OSVmImage)
steps:
- template: build.yml
- script: npm run rlc-generate-swaggers
Expand All @@ -168,16 +174,18 @@ stages:
strategy:
matrix:
macOS_Node20:
Pool:
Pool: ${{ parameters.MacPool }}
OSVmImage: "macOS-latest"
NodeTestVersion: "20.x"
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
# Should set "demands:" to select image from azsdk-pool, but this would require creating separate
Copy link
Copy Markdown
Member Author

@mikeharder mikeharder Jun 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is hacky, but easier that splitting the matrix

# matrixes for the two pools. Instead, we can use the default image from azsdk-pool for linux.
steps:
- template: build.yml
- task: NodeTool@0
Expand Down Expand Up @@ -226,11 +234,11 @@ stages:
matrix:
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
demands: ImageOverride -equals $(OSVmImage)
steps:
- template: build.yml
- script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js smoke-test
Expand All @@ -247,12 +255,12 @@ stages:
strategy:
matrix:
Windows_Latest:
Pool:
Pool: ${{ parameters.WindowsPool }}
OSVmImage: ${{ parameters.Windows_Latest }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
demands: ImageOverride -equals $(OSVmImage)
steps:
- template: build.yml
- script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js smoke-test:contoso && node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js smoke-test:todo
Expand All @@ -266,16 +274,18 @@ stages:
strategy:
matrix:
macOS_Node20:
Pool:
Pool: ${{ parameters.MacPool }}
OSVmImage: "macOS-latest"
NodeTestVersion: "20.x"
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
# Should set "demands:" to select image from azsdk-pool, but this would require creating separate
# matrixes for the two pools. Instead, we can use the default image from azsdk-pool for linux.
steps:
- template: build.yml
- script: npm run check-format
Expand Down Expand Up @@ -336,16 +346,18 @@ stages:
strategy:
matrix:
macOS_Node20:
Pool:
Pool: ${{ parameters.MacPool }}
OSVmImage: "macOS-latest"
NodeTestVersion: "20.x"
Linux_Node20:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
OSVmImage: ${{ parameters.OSVmImage }}
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
# Should set "demands:" to select image from azsdk-pool, but this would require creating separate
# matrixes for the two pools. Instead, we can use the default image from azsdk-pool for linux.
steps:
- template: build.yml
- script: npm run test:azure
Expand Down
4 changes: 2 additions & 2 deletions .scripts/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ schedules:
pr: none

pool:
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: ubuntu-20.04
name: azsdk-pool
demands: ImageOverride -equals ubuntu-24.04

stages:
- stage: NightlyCI
Expand Down
4 changes: 2 additions & 2 deletions .scripts/preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ resources:
ref: refs/heads/main

pool:
name: azsdk-pool-mms-win-2022-general
vmImage: windows-2022
name: azsdk-pool
demands: ImageOverride -equals windows-2022

extends:
template: eng/pipelines/templates/stages/archetype-autorest-preview.yml@azure-sdk-tools
Expand Down
26 changes: 13 additions & 13 deletions .scripts/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ parameters:

- name: LinuxPool
type: string
default: azsdk-pool-mms-ubuntu-2004-general
default: azsdk-pool

- name: OSVmImage
type: string
default: ubuntu-20.04
default: ubuntu-24.04

stages:
- ${{if and(eq(variables['Build.Reason'], 'Manual'), eq(variables['System.TeamProject'], 'internal'))}}:
Expand All @@ -24,7 +24,7 @@ stages:

pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals ${{ parameters.OSVmImage }}

variables:
MAIN_VERSION: $[ stageDependencies.BuildStage.Build.outputs['PackAutorestTypescriptArtifacts.MAIN_VERSION'] ]
Expand Down Expand Up @@ -52,7 +52,7 @@ stages:
condition: ne(variables['SetDevVersion'], 'true')
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand All @@ -78,7 +78,7 @@ stages:

pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}

variables:
MAIN_VERSION: $[ stageDependencies.BuildStage.Build.outputs['PackTypeSpecTSArtifacts.MAIN_VERSION'] ]
Expand Down Expand Up @@ -106,7 +106,7 @@ stages:
condition: ne(variables['SetDevVersion'], 'true')
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand All @@ -133,7 +133,7 @@ stages:

pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}

variables:
MAIN_VERSION: $[ stageDependencies.BuildStage.Build.outputs['PackRLCCommonArtifacts.MAIN_VERSION'] ]
Expand Down Expand Up @@ -161,7 +161,7 @@ stages:
condition: ne(variables['SetDevVersion'], 'true')
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand Down Expand Up @@ -189,7 +189,7 @@ stages:
displayName: Publish @autorest/typescript dev version to GitHub
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand Down Expand Up @@ -217,7 +217,7 @@ stages:
displayName: Publish @azure-tools/rlc-common and @azure-tools/typespec-ts dev version to GitHub
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand All @@ -243,7 +243,7 @@ stages:
displayName: Publish @autorest/typescript dev version to NPM
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand All @@ -266,7 +266,7 @@ stages:
displayName: Publish @azure-tools/typespec-ts dev version to NPM
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand All @@ -289,7 +289,7 @@ stages:
displayName: Publish @azure-tools/rlc-common dev version to NPM
pool:
name: ${{ parameters.LinuxPool }}
vmImage: ${{ parameters.OSVmImage }}
demands: ImageOverride -equals {{ parameters.OSVmImage }}
strategy:
runOnce:
deploy:
Expand Down
6 changes: 3 additions & 3 deletions .scripts/smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
strategy:
matrix:
Linux_Node20:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: "ubuntu-20.04"
Pool: azsdk-pool
OSVmImage: "ubuntu-24.04"
NodeTestVersion: "20.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
demands: ImageOverride -equals $(OSVmImage)
steps:
- template: build.yml
- script: npm run clone:specs
Expand Down
1 change: 1 addition & 0 deletions packages/autorest.typescript/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module.exports = function(config) {
flags: [
"--disable-web-security", // disable cors
"--disk-cache-dir null", // disable browser caching (note: If in regular Chrome, go to Devtools -> Network -> Disable Cache)
"--no-sandbox", // prevent error "no usable sandbox" on ubuntu-24.04
]
}
},
Expand Down
Loading
⚡