Skip to content

Commit 7dadf0e

Browse files
JimSuplizioJimSuplizio
authored
Move to the new pools (Azure#45020)
* Move to the new pools * Try something that might actually work for the aggregate-reports.yml * Update the repository capture * use the 1es stage template * add image.yml to variables so the pool correctly picks stuff up * add baseline file back so aggregate reports works * Remove the credscan, which is redundant now and the java.gdnbaselines * the azsdk-pool-storage pool isn't read yet, move to azsdk-pool * fix up pool.os parameter to use strings from image.yml where able * update template bom for release test * Use image.yml for pool variables for spring templates * Fix platform matrix linux names, 2004->2204 * Remove pool.os variables from image.yml and stop using them. 1ES PT needs the OS hardcoded as variables for that field won't work * undo changes to template bom since no yml in the piplines for pom release will be changed * remove casing change accidentally makde to Os * Remove the pool redirection from storage/tests-template.yml * More places to change the agent from ubuntu-20.04 to ubuntu-22.04 * storage tests-template.yml needs to be a 1ES PT template * add space after template: * Add LINUXVMIMAGE and WINDOWSVMIMAGE to cspell.json * update cspell * Increase timeout of storage - tests
1 parent 8b006d5 commit 7dadf0e

29 files changed

+255
-237
lines changed

‎.vscode/cspell.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@
331331
"kvlt",
332332
"linecoverage",
333333
"linksource",
334+
"LINUXVMIMAGE",
334335
"listbyconfigurationprofileassignments",
335336
"localizable",
336337
"logit",
@@ -417,6 +418,7 @@
417418
"VNET",
418419
"westcentralus",
419420
"westus",
421+
"WINDOWSVMIMAGE",
420422
"windowtitle",
421423
"wordomatic",
422424
"xlint",

‎eng/automation/generation_data.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger: none
33
pr: none
44

55
pool:
6-
vmImage: 'ubuntu-20.04'
6+
vmImage: 'ubuntu-22.04'
77

88
variables:
99
- group: Release Secrets for GitHub

‎eng/containers/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extends:
3232
- job:
3333
displayName: Docker Build and Publish
3434
pool:
35-
name: $(LINUXNEXTPOOL)
35+
name: $(LINUXPOOL)
3636
image: $(LINUXNEXTVMIMAGE)
3737
os: linux
3838

‎eng/pipelines/aggregate-reports.yml‎

Lines changed: 185 additions & 173 deletions
Large diffs are not rendered by default.

‎eng/pipelines/bompreparation.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@ pr: none
44

55
stages:
66
- stage: AnalyzeAndGeneratePatches
7+
variables:
8+
- template: /eng/pipelines/templates/variables/globals.yml
9+
- template: /eng/pipelines/templates/variables/image.yml
710

811
jobs:
912
- job: PatchGeneration
1013
timeoutInMinutes: 180
1114

1215
pool:
13-
vmImage: 'windows-2022'
16+
name: $(WINDOWSPOOL)
17+
image: $(WINDOWSVMIMAGE)
18+
os: windows
1419

1520
steps:
1621
- pwsh: |

‎eng/pipelines/docindex.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ parameters:
2121

2222
variables:
2323
- template: /eng/pipelines/templates/variables/globals.yml
24+
- template: /eng/pipelines/templates/variables/image.yml
2425
jobs:
2526
- template: /eng/common/pipelines/templates/jobs/docindex.yml
2627

2728
- job: UpdateDocsMsBuildConfig
2829
pool:
29-
vmImage: ubuntu-20.04
30+
name: $(LINUXPOOL)
31+
image: $(LINUXNEXTVMIMAGE)
32+
os: linux
3033
timeoutInMinutes: 180
3134
variables:
3235
DocRepoLocation: $(Pipeline.Workspace)/docs

‎eng/pipelines/patch-release-prepare.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extends:
3333
- pwsh: |
3434
$currentDate = Get-Date -Format "yyyyMMdd"
3535
Write-Host "##vso[task.setvariable variable=PatchDate]$currentDate"
36-
36+
3737
$branchName = "release/patch/$currentDate"
3838
Write-Host "##vso[task.setvariable variable=BaseBranchName]$branchName"
3939
Write-Host "git checkout -b $branchName"

‎eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"matrix": {
66
"Agent": {
7-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
7+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
88
},
99
"EmulatorConfig": {
1010
"Emulator VNext Integration Tests On Insecure Connection - Java ": {

‎eng/pipelines/templates/stages/native-platform-matrix.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"matrix": {
66
"Agent": {
7-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
7+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
88
},
99
"JavaTestVersion": [ "1.11" ],
1010
"AZURE_TEST_HTTP_CLIENTS": [ "netty" ],
@@ -16,7 +16,7 @@
1616
"include": [
1717
{
1818
"Agent": {
19-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
19+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
2020
},
2121
"JavaTestVersion": "1.11",
2222
"AZURE_TEST_HTTP_CLIENTS": "netty",

‎eng/pipelines/templates/stages/platform-matrix.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"matrix": {
99
"Agent": {
10-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
10+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
1111
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
1212
"macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
1313
},
@@ -31,7 +31,7 @@
3131
"include": [
3232
{
3333
"Agent": {
34-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
34+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
3535
},
3636
"JavaTestVersion": "1.21",
3737
"AZURE_TEST_HTTP_CLIENTS": "netty",
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"Agent": {
49-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
49+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
5050
},
5151
"JavaTestVersion": "1.21",
5252
"AZURE_TEST_HTTP_CLIENTS": "netty",
@@ -61,7 +61,7 @@
6161
},
6262
{
6363
"Agent": {
64-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
64+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
6565
},
6666
"JavaTestVersion": "1.11",
6767
"AZURE_TEST_HTTP_CLIENTS": "netty",
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"Agent": {
79-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
79+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
8080
},
8181
"JavaTestVersion": "1.17",
8282
"AZURE_TEST_HTTP_CLIENTS": "netty",
@@ -91,7 +91,7 @@
9191
},
9292
{
9393
"Agent": {
94-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
94+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
9595
},
9696
"JavaTestVersion": "1.17",
9797
"AZURE_TEST_HTTP_CLIENTS": "JdkHttpClientProvider",
@@ -106,7 +106,7 @@
106106
},
107107
{
108108
"Agent": {
109-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
109+
"ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
110110
},
111111
"JavaTestVersion": "1.17",
112112
"AZURE_TEST_HTTP_CLIENTS": "VertxHttpClientProvider",

0 commit comments

Comments
 (0)