Skip to content

Commit fb2adf8

Browse files
michaelgsharpmichaelgsharp
authored
Ubuntu 18.04 queues (dotnet#5970)
1 parent 9b28b24 commit fb2adf8

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎.vsts-dotnet-ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
_targetFramework: netcoreapp3.1
3737
innerLoop: true
3838
pool:
39-
name: Hosted Ubuntu 1604
39+
vmImage: ubuntu-18.04
4040
helixQueue: [email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652
4141

4242
- template: /build/ci/job-template.yml
@@ -58,7 +58,7 @@ jobs:
5858
_targetFramework: netcoreapp3.1
5959
innerLoop: true
6060
pool:
61-
name: Hosted Ubuntu 1604
61+
vmImage: ubuntu-18.04
6262
helixQueue: [email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652
6363

6464
- template: /build/ci/job-template.yml
@@ -79,8 +79,8 @@ jobs:
7979
_targetFramework: netcoreapp3.1
8080
innerLoop: true
8181
pool:
82-
name: Hosted Ubuntu 1604
83-
helixQueue: Ubuntu.1604[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
82+
vmImage: ubuntu-18.04
83+
helixQueue: Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
8484

8585
- template: /build/ci/job-template.yml
8686
parameters:
@@ -89,16 +89,16 @@ jobs:
8989
container: UbuntuContainer
9090
innerLoop: true
9191
pool:
92-
name: Hosted Ubuntu 1604
93-
helixQueue: Ubuntu.1604[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af
92+
vmImage: ubuntu-18.04
93+
helixQueue: Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af
9494

9595
- template: /build/ci/job-template.yml
9696
parameters:
9797
name: MacOS_x64_NetCoreApp21
9898
buildScript: ./build.sh
9999
innerLoop: true
100100
pool:
101-
name: Hosted macOS
101+
vmImage: macOS-10.15
102102
helixQueue: OSX.1015.Amd64.Open
103103

104104
- template: /build/ci/job-template.yml
@@ -141,7 +141,7 @@ jobs:
141141
innerLoop: true
142142
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
143143
pool:
144-
name: Hosted VS2017
144+
vmImage: windows-2019
145145
helixQueue: Windows.10.Amd64.Open
146146

147147
- template: /build/ci/job-template.yml
@@ -151,7 +151,7 @@ jobs:
151151
innerLoop: true
152152
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
153153
pool:
154-
name: Hosted VS2017
154+
vmImage: windows-2019
155155
helixQueue: Windows.10.Amd64.Open
156156

157157
- template: /build/ci/job-template.yml
@@ -172,7 +172,7 @@ jobs:
172172
innerLoop: true
173173
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
174174
pool:
175-
name: Hosted VS2017
175+
vmImage: windows-2019
176176
helixQueue: Windows.10.Amd64.Open
177177

178178
- template: /build/ci/job-template.yml
@@ -183,5 +183,5 @@ jobs:
183183
innerLoop: true
184184
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
185185
pool:
186-
name: Hosted VS2017
186+
vmImage: windows-2019
187187
helixQueue: Windows.10.Amd64.Open

‎build/.night-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.5.5
18+
- releases/1.6.0
1919
- features/automl
2020
- features/integrationPackage
2121
always: true
@@ -47,7 +47,7 @@ jobs:
4747
_includeBenchmarkData: true
4848
nightlyBuild: true
4949
pool:
50-
name: Hosted Ubuntu 1604
50+
vmImage: ubuntu-18.04
5151

5252
- template: /build/ci/job-template.yml
5353
parameters:
@@ -56,15 +56,15 @@ jobs:
5656
container: UbuntuContainer
5757
nightlyBuild: true
5858
pool:
59-
name: Hosted Ubuntu 1604
59+
vmImage: ubuntu-18.04
6060

6161
- template: /build/ci/job-template.yml
6262
parameters:
6363
name: MacOS_x64_NetCoreApp21
6464
buildScript: ./build.sh
6565
nightlyBuild: true
6666
pool:
67-
name: Hosted macOS
67+
vmImage: macOS-10.15
6868

6969
- template: /build/ci/job-template.yml
7070
parameters:
@@ -81,15 +81,15 @@ jobs:
8181
_includeBenchmarkData: true
8282
nightlyBuild: true
8383
pool:
84-
name: Hosted VS2017
84+
vmImage: windows-2019
8585

8686
- template: /build/ci/job-template.yml
8787
parameters:
8888
name: Windows_x64_NetCoreApp21
8989
buildScript: build.cmd
9090
nightlyBuild: true
9191
pool:
92-
name: Hosted VS2017
92+
vmImage: windows-2019
9393

9494
- template: /build/ci/job-template.yml
9595
parameters:
@@ -106,7 +106,7 @@ jobs:
106106
_includeBenchmarkData: false
107107
nightlyBuild: true
108108
pool:
109-
name: Hosted VS2017
109+
vmImage: windows-2019
110110

111111
- template: /build/ci/job-template.yml
112112
parameters:
@@ -115,4 +115,4 @@ jobs:
115115
buildScript: build.cmd
116116
nightlyBuild: true
117117
pool:
118-
name: Hosted VS2017
118+
vmImage: windows-2019

‎build/.outer-loop-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.5.5
18+
- releases/1.6.0
1919
- features/automl
2020
- features/integrationPackage
2121
always: true
@@ -45,22 +45,22 @@ jobs:
4545
_config_short: RI
4646
_includeBenchmarkData: true
4747
pool:
48-
name: Hosted Ubuntu 1604
48+
vmImage: ubuntu-18.04
4949

5050
- template: /build/ci/job-template.yml
5151
parameters:
5252
name: Ubuntu_x64_NetCoreApp21
5353
buildScript: ./build.sh
5454
container: UbuntuContainer
5555
pool:
56-
name: Hosted Ubuntu 1604
56+
vmImage: ubuntu-18.04
5757

5858
- template: /build/ci/job-template.yml
5959
parameters:
6060
name: MacOS_x64_NetCoreApp21
6161
buildScript: ./build.sh
6262
pool:
63-
name: Hosted macOS
63+
vmImage: macOS-10.15
6464

6565
- template: /build/ci/job-template.yml
6666
parameters:
@@ -76,14 +76,14 @@ jobs:
7676
_config_short: RI
7777
_includeBenchmarkData: true
7878
pool:
79-
name: Hosted VS2017
79+
vmImage: windows-2019
8080

8181
- template: /build/ci/job-template.yml
8282
parameters:
8383
name: Windows_x64_NetCoreApp21
8484
buildScript: build.cmd
8585
pool:
86-
name: Hosted VS2017
86+
vmImage: windows-2019
8787

8888
- template: /build/ci/job-template.yml
8989
parameters:
@@ -99,12 +99,12 @@ jobs:
9999
_config_short: RFX
100100
_includeBenchmarkData: false
101101
pool:
102-
name: Hosted VS2017
102+
vmImage: windows-2019
103103

104104
- template: /build/ci/job-template.yml
105105
parameters:
106106
name: Windows_x86_NetCoreApp21
107107
architecture: x86
108108
buildScript: build.cmd
109109
pool:
110-
name: Hosted VS2017
110+
vmImage: windows-2019

‎build/ci/job-template.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
spaceValue: ' '
3838
${{ if eq(parameters.buildScript, './build.sh') }}:
3939
spaceValue: '%20'
40-
${{ if and(eq(parameters.pool.name, 'Hosted Ubuntu 1604'), contains(parameters.name, 'cross')) }}:
40+
${{ if and(eq(parameters.pool.vmImage, 'ubuntu-18.04'), contains(parameters.name, 'cross')) }}:
4141
ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}'
4242
${{ if eq(parameters.testTargetFramework, '') }}:
4343
testTargetFramework: ''
@@ -66,31 +66,31 @@ jobs:
6666

6767
steps:
6868
# Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
69-
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
69+
- ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}:
7070
- script: |
7171
rm -rf /usr/local/bin/2to3
7272
displayName: MacOS Homebrew bug Workaround
7373
continueOnError: true
7474
# Extra MacOS step required to install OS-specific dependencies
75-
- ${{ if and(eq(parameters.pool.name, 'Hosted macOS'), not(contains(parameters.name, 'cross'))) }}:
75+
- ${{ if and(eq(parameters.pool.vmImage, 'macOS-10.15'), not(contains(parameters.name, 'cross'))) }}:
7676
- script: brew update && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula && brew link libomp --force
7777
displayName: Install MacOS build dependencies
7878
# Extra Apple MacOS step required to install OS-specific dependencies
7979
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
8080
- script: brew update && brew install mono-libgdiplus && brew install libomp && brew link libomp --force
8181
displayName: Install MacOS ARM build dependencies
82-
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
82+
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
8383
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
8484
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
8585
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
8686
displayName: Build
87-
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
87+
- ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}:
8888
- task: Bash@3
8989
inputs:
9090
targetType: inline
9191
script: cd packages;find . -type d -path "*/runtimes/linux-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
9292
displayName: Clean up non-MacOS runtime folders of NuGet Packages to save disk space
93-
- ${{ if eq(parameters.pool.name, 'Hosted Ubuntu 1604') }}:
93+
- ${{ if eq(parameters.pool.vmImage, 'ubuntu-18.04') }}:
9494
- task: Bash@3
9595
inputs:
9696
targetType: inline

0 commit comments

Comments
 (0)