Skip to content

Commit af2287d

Browse files
authored
Update pipeline configuration from Ubuntu 20.04 to Ubuntu 24.04 (Azure#50505)
1 parent ce2ca9a commit af2287d

29 files changed

+81
-278
lines changed

eng/InstallDevopsLogger.proj

Lines changed: 0 additions & 10 deletions
This file was deleted.

eng/pipelines/aggregate-reports.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ pr:
1010
- eng/CredScanSuppression.json
1111

1212
pool:
13-
name: azsdk-pool-mms-win-2022-general
14-
vmImage: windows-2022
13+
name: $(WINDOWSPOOL)
14+
demands: $(WindowsImageDemand)
1515

1616
variables:
1717
- template: templates/variables/globals.yml
18+
- template: templates/variables/image.yml
1819

1920
stages:
2021
- stage: AggregateReports

eng/pipelines/templates/jobs/live.tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ jobs:
134134
Write-Host "##vso[task.setvariable variable=TestResourcesDirectory]$directory"
135135
displayName: Set TestResources Location
136136
137+
# Install dotnet before resource deployment so the pre/post scripts can run dotnet commands.
138+
- template: /eng/pipelines/templates/steps/install-dotnet.yml
139+
parameters:
140+
Container: ${{ parameters.UsePlatformContainer }}
141+
137142
- ${{ if parameters.DeployTestResources }}:
138143
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
139144
- template: /eng/common/TestResources/deploy-test-resources.yml
@@ -158,9 +163,6 @@ jobs:
158163
Write-Host "##vso[task.setvariable variable=TestMode]Record"
159164
}
160165
displayName: Set Test Mode
161-
- template: /eng/pipelines/templates/steps/install-dotnet.yml
162-
parameters:
163-
Container: ${{ parameters.UsePlatformContainer }}
164166
165167
- ${{ if eq('true', parameters.UseFederatedAuth) }}:
166168
- task: AzurePowerShell@5

eng/pipelines/templates/jobs/mgmt-release.yml

Lines changed: 0 additions & 92 deletions
This file was deleted.

eng/pipelines/templates/jobs/smoke-test-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88
},
99
"TestTargetFramework": ["net462", "net8.0", "net9.0"]
10-
}
10+
},
1111
"include": [
1212
{
1313
"Agent": {

eng/pipelines/templates/stages/1es-redirect.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ extends:
5252
exclude:
5353
- repository: azure-sdk-build-tools
5454
sourceAnalysisPool:
55-
name: azsdk-pool-mms-win-2022-general
56-
image: azsdk-pool-mms-win-2022-1espt
55+
name: azsdk-pool
56+
image: windows-2022
5757
os: windows
5858
binskim:
5959
# Exclude aot checking project, and imported azure-sdk-build-tools gpg/azcopy binaries

eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
},
66
"matrix": {
77
"Agent": {
8-
"Ubuntu-20.04_NET8.0": {
8+
"Ubuntu-24.04_NET8.0": {
99
"OSVmImage": "env:LINUXVMIMAGE",
1010
"Pool": "env:LINUXPOOL",
1111
"TestTargetFramework": "net8.0"
1212
},
13-
"Ubuntu-20.04_NET9.0": {
13+
"Ubuntu-24.04_NET9.0": {
1414
"OSVmImage": "env:LINUXVMIMAGE",
1515
"Pool": "env:LINUXPOOL",
1616
"TestTargetFramework": "net9.0"

eng/pipelines/templates/steps/install-dotnet.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ parameters:
44
Container: false
55

66
steps:
7-
- task: MSBuild@1
8-
displayName: Install DevOps Logger
9-
condition: and(succeeded(), eq(${{ parameters.Container }}, false))
10-
inputs:
11-
solution: eng/InstallDevopsLogger.proj
12-
msbuildArguments: /p:WorkFolder="$(Agent.WorkFolder)" /p:BuildDirectory="$(Agent.BuildDirectory)"
137
# Installation steps need to be uncommented when switching to a newer SDK that's not available on DevOps agents
148
- task: UseDotNet@2
159
displayName: 'Use .NET SDK'
@@ -31,4 +25,4 @@ steps:
3125
path: $(NUGET_PACKAGES)
3226
condition: and(succeeded(), ${{parameters.EnableNuGetCache}})
3327
continueOnError: true
34-
displayName: Cache NuGet packages
28+
displayName: Cache NuGet packages

eng/pipelines/templates/variables/image.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
variables:
44
- name: LINUXPOOL
5-
value: azsdk-pool-mms-ubuntu-2004-general
5+
value: azsdk-pool
66
- name: WINDOWSPOOL
7-
value: azsdk-pool-mms-win-2022-general
7+
value: azsdk-pool
88
- name: MACPOOL
99
value: Azure Pipelines
1010

1111
- name: LINUXVMIMAGE
12-
value: azsdk-pool-mms-ubuntu-2004-1espt
13-
- name: LINUXNEXTVMIMAGE
14-
value: ubuntu-22.04
12+
value: ubuntu-24.04
1513
- name: WINDOWSVMIMAGE
16-
value: azsdk-pool-mms-win-2022-1espt
14+
value: windows-2022
1715
- name: MACVMIMAGE
1816
value: macos-latest
1917

@@ -26,4 +24,6 @@ variables:
2624
value: macOS
2725

2826
- name: LinuxImageDemand
29-
value: ImageOverride -equals $(LINUXVMIMAGE)
27+
value: ImageOverride -equals $(LINUXVMIMAGE)
28+
- name: WindowsImageDemand
29+
value: ImageOverride -equals $(WINDOWSVMIMAGE)

0 commit comments

Comments
 (0)