Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ubuntu 18.04 queues #5970

Merged
merged 4 commits into from Oct 14, 2021
Merged

Ubuntu 18.04 queues #5970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b153e0
Ubuntu18.04
michaelgsharp Oct 11, 2021
bb93a20
Switching to Ubuntu 18.04 queue.
michaelgsharp Oct 12, 2021
c32d699
Fixed invalid docker id
michaelgsharp Oct 13, 2021
fda7fd7
yml updates.
michaelgsharp Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ jobs:
_targetFramework: netcoreapp3.1
innerLoop: true
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04
helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652

- template: /build/ci/job-template.yml
Expand All @@ -58,7 +58,7 @@ jobs:
_targetFramework: netcoreapp3.1
innerLoop: true
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04
helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652

- template: /build/ci/job-template.yml
Expand All @@ -79,8 +79,8 @@ jobs:
_targetFramework: netcoreapp3.1
innerLoop: true
pool:
name: Hosted Ubuntu 1604
helixQueue: Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
vmImage: ubuntu-18.04
helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -89,16 +89,16 @@ jobs:
container: UbuntuContainer
innerLoop: true
pool:
name: Hosted Ubuntu 1604
helixQueue: Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af
vmImage: ubuntu-18.04
helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af

- template: /build/ci/job-template.yml
parameters:
name: MacOS_x64_NetCoreApp21
buildScript: ./build.sh
innerLoop: true
pool:
name: Hosted macOS
vmImage: macOS-10.15
helixQueue: OSX.1015.Amd64.Open

- template: /build/ci/job-template.yml
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
innerLoop: true
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
pool:
name: Hosted VS2017
vmImage: windows-2019
helixQueue: Windows.10.Amd64.Open

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

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

- template: /build/ci/job-template.yml
Expand All @@ -183,5 +183,5 @@ jobs:
innerLoop: true
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
pool:
name: Hosted VS2017
vmImage: windows-2019
helixQueue: Windows.10.Amd64.Open
16 changes: 8 additions & 8 deletions build/.night-build.yml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ schedules:
branches:
include:
- main
- releases/1.5.5
- releases/1.6.0
- features/automl
- features/integrationPackage
always: true
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
_includeBenchmarkData: true
nightlyBuild: true
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -56,15 +56,15 @@ jobs:
container: UbuntuContainer
nightlyBuild: true
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04

- template: /build/ci/job-template.yml
parameters:
name: MacOS_x64_NetCoreApp21
buildScript: ./build.sh
nightlyBuild: true
pool:
name: Hosted macOS
vmImage: macOS-10.15

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -81,15 +81,15 @@ jobs:
_includeBenchmarkData: true
nightlyBuild: true
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
name: Windows_x64_NetCoreApp21
buildScript: build.cmd
nightlyBuild: true
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -106,7 +106,7 @@ jobs:
_includeBenchmarkData: false
nightlyBuild: true
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -115,4 +115,4 @@ jobs:
buildScript: build.cmd
nightlyBuild: true
pool:
name: Hosted VS2017
vmImage: windows-2019
16 changes: 8 additions & 8 deletions build/.outer-loop-build.yml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ schedules:
branches:
include:
- main
- releases/1.5.5
- releases/1.6.0
- features/automl
- features/integrationPackage
always: true
Expand Down Expand Up @@ -45,22 +45,22 @@ jobs:
_config_short: RI
_includeBenchmarkData: true
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04

- template: /build/ci/job-template.yml
parameters:
name: Ubuntu_x64_NetCoreApp21
buildScript: ./build.sh
container: UbuntuContainer
pool:
name: Hosted Ubuntu 1604
vmImage: ubuntu-18.04

- template: /build/ci/job-template.yml
parameters:
name: MacOS_x64_NetCoreApp21
buildScript: ./build.sh
pool:
name: Hosted macOS
vmImage: macOS-10.15

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -76,14 +76,14 @@ jobs:
_config_short: RI
_includeBenchmarkData: true
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
name: Windows_x64_NetCoreApp21
buildScript: build.cmd
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
Expand All @@ -99,12 +99,12 @@ jobs:
_config_short: RFX
_includeBenchmarkData: false
pool:
name: Hosted VS2017
vmImage: windows-2019

- template: /build/ci/job-template.yml
parameters:
name: Windows_x86_NetCoreApp21
architecture: x86
buildScript: build.cmd
pool:
name: Hosted VS2017
vmImage: windows-2019
12 changes: 6 additions & 6 deletions build/ci/job-template.yml
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ jobs:
spaceValue: ' '
${{ if eq(parameters.buildScript, './build.sh') }}:
spaceValue: '%20'
${{ if and(eq(parameters.pool.name, 'Hosted Ubuntu 1604'), contains(parameters.name, 'cross')) }}:
${{ if and(eq(parameters.pool.vmImage, 'ubuntu-18.04'), contains(parameters.name, 'cross')) }}:
ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}'
${{ if eq(parameters.testTargetFramework, '') }}:
testTargetFramework: ''
Expand Down Expand Up @@ -66,31 +66,31 @@ jobs:

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