Skip to content

Commit 4cf1273

Browse files
mikeharderhallipr
andauthored
[EngSys] Update pipelines to use ubuntu-24 and azsdk-pool (microsoft#7399)
Co-authored-by: Patrick Hallisey <[email protected]>
1 parent 2c185d5 commit 4cf1273

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ extends:
3333
enabled: false
3434
justificationForDisabling: CodeQL times our pipelines out by running for 2+ hours before being force canceled.
3535
sourceAnalysisPool:
36-
name: azsdk-pool-mms-win-2022-general
37-
image: azsdk-pool-mms-win-2022-1espt
36+
name: azsdk-pool
37+
image: windows-2022
3838
os: windows
3939
credscan:
4040
suppressionsFile: $(Build.SourcesDirectory)/eng/common/CredScanSuppression.json

eng/common/pipelines/templates/variables/image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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
- name: LINUXARMPOOL
@@ -13,13 +13,13 @@ variables:
1313
value: azsdk-pool-arm64
1414

1515
- name: LINUXVMIMAGE
16-
value: azsdk-pool-mms-ubuntu-2004-1espt
16+
value: ubuntu-24.04
1717
- name: LINUXNEXTVMIMAGE
18-
value: azsdk-pool-mms-ubuntu-2204-1espt
18+
value: ubuntu-24.04
1919
- name: LINUXARMVMIMAGE
2020
value: azsdk-pool-mms-mariner-2-arm-1espt
2121
- name: WINDOWSVMIMAGE
22-
value: azsdk-pool-mms-win-2022-1espt
22+
value: windows-2022
2323
- name: WINDOWSARMVMIMAGE
2424
value: windows-2022-arm64-1espt
2525
- name: MACVMIMAGE # mac - arm64

eng/emitters/pipelines/templates/stages/emitter-stages.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ stages:
310310
# todo update so we can publish publicly to nuget
311311
publishVstsFeed: "29ec6040-b234-4e31-b139-33dc4287b756/fa8c16a3-dbe0-4de2-a297-03065ec1ba3f"
312312
nuGetFeedType: internal
313+
# must set useDotNetTask=true on ubuntu-24.04 or later
314+
useDotNetTask: true
313315

314316
- template: /eng/emitters/pipelines/templates/steps/create-apireview.yml
315317
parameters:

eng/tsp-core/pipelines/jobs/cli/publish-artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
PACKAGE_VERSION: $[ dependencies.CheckIfPublish.outputs['SetPackageVersion.PACKAGE_VERSION'] ]
3535
condition: ne(dependencies.CheckIfPublish.outputs['SetPackageVersion.SKIP_PUBLISH'], 'true')
3636
pool:
37-
name: azsdk-pool-mms-ubuntu-2004-general
38-
image: azsdk-pool-mms-ubuntu-2004-1espt
37+
name: azsdk-pool
38+
image: ubuntu-24.04
3939
os: linux
4040
strategy:
4141
runOnce:

packages/http-client-csharp/eng/pipeline/publish.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,8 @@ extends:
4242
LanguageShortName: "csharp"
4343
HasNugetPackages: true
4444
CadlRanchName: "@typespec/http-client-csharp"
45+
AdditionalInitializeSteps:
46+
- task: UseDotNet@2
47+
inputs:
48+
useGlobalJson: true
49+
workingDirectory: $(Build.SourcesDirectory)/packages/http-client-csharp

packages/http-client-csharp/eng/pipeline/templates/ci-stages.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,8 @@ stages:
3838
Condition: ${{ parameters.Condition }}
3939
DependsOn: ${{ parameters.DependsOn }}
4040
LanguageShortName: "csharp"
41+
AdditionalInitializeSteps:
42+
- task: UseDotNet@2
43+
inputs:
44+
useGlobalJson: true
45+
workingDirectory: $(Build.SourcesDirectory)/packages/http-client-csharp

packages/http-client-csharp/eng/scripts/Initialize-Repository.ps1

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ try {
1717
Remove-Item -Recurse -Force "./node_modules"
1818
}
1919

20-
# install dotnet
21-
if ($IsWindows) {
22-
# download and run https://dot.net/v1/dotnet-install.ps1
23-
Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
24-
./dotnet-install.ps1 -Version '8.0.204'
25-
}
26-
else {
27-
Invoke-WebRequest 'https://dot.net/v1/dotnet-install.sh' -OutFile 'dotnet-install.sh'
28-
bash ./dotnet-install.sh --version 8.0.204
29-
}
30-
3120
# install and list npm packages
3221

3322
if ($BuildArtifactsPath) {

0 commit comments

Comments
 (0)