Skip to content

Commit 4522ae4

Browse files
authored
Merge branch 'Azure:main' into main
2 parents c8ce251 + 5d37cac commit 4522ae4

File tree

54 files changed

+400
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+400
-121
lines changed

eng/common/TestResources/New-TestResources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ try {
515515

516516
# Try to detect the shell based on the parent process name (e.g. launch via shebang).
517517
$shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Parent.ProcessName) -and $parentProcessName -eq 'cmd') {
518-
'cmd', 'set {0}={1}'
518+
'cmd', 'set {0}=''{1}'''
519519
} elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
520-
'shell', 'export {0}={1}'
520+
'shell', 'export {0}=''{1}'''
521521
} else {
522522
'PowerShell', '${{env:{0}}} = ''{1}'''
523523
}

eng/pipelines/autorest_checks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
displayName: 'Run AutoRest'
2626

2727
pool:
28+
name: azsdk-pool-mms-ubuntu-2004-general
2829
vmImage: 'ubuntu-20.04'
2930

3031
steps:

eng/pipelines/generate-all-docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
timeoutInMinutes: 120
1313

1414
pool:
15+
name: azsdk-pool-mms-ubuntu-2004-general
1516
vmImage: 'ubuntu-20.04'
1617

1718
steps:

eng/pipelines/templates/jobs/update_pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ variables:
1010
skipComponentGovernanceDetection: true
1111

1212
pool:
13-
vmImage: 'ubuntu-latest'
13+
name: azsdk-pool-mms-ubuntu-2204-general
14+
vmImage: 'ubuntu-22.04'
1415

1516
steps:
1617
- task: UsePythonVersion@0

eng/pipelines/templates/stages/archetype-conda-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ stages:
1818

1919
pool:
2020
name: azsdk-pool-mms-ubuntu-2004-general
21-
vmImage: MMSUbuntu20.04
21+
vmImage: 'ubuntu-20.04'
2222

2323
strategy:
2424
runOnce:

scripts/auto_release/PythonSdkLiveTest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
strategy:
2626
maxParallel: 5
2727
pool:
28+
name: azsdk-pool-mms-ubuntu-2004-general
2829
vmImage: 'ubuntu-20.04'
2930
variables:
3031
Codeql.Enabled: false

scripts/collect_api_version_for_multi_api_sdk/collect_api_version.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
strategy:
2323
maxParallel: 1
2424
pool:
25+
name: azsdk-pool-mms-ubuntu-2004-general
2526
vmImage: 'ubuntu-20.04'
2627
steps:
2728
- task: UsePythonVersion@0

scripts/issue_helper/issue_helper.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
strategy:
3232
maxParallel: 3
3333
pool:
34+
name: azsdk-pool-mms-ubuntu-2004-general
3435
vmImage: 'ubuntu-20.04'
3536
steps:
3637
- task: UsePythonVersion@0

scripts/release_helper/release_helper.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
strategy:
3636
maxParallel: 1
3737
pool:
38+
name: azsdk-pool-mms-ubuntu-2004-general
3839
vmImage: 'ubuntu-20.04'
3940
variables:
4041
Codeql.Enabled: false

scripts/release_sdk_status/release_sdk_status.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
strategy:
3535
maxParallel: 1
3636
pool:
37+
name: azsdk-pool-mms-ubuntu-2004-general
3738
vmImage: 'ubuntu-20.04'
3839
steps:
3940
- task: UsePythonVersion@0

0 commit comments

Comments
 (0)