Update release/6.0.1xx build machines (#12748)
* Switch another leg to Ubuntu 18 * Switch to Ubuntu 18 * Also update source build queues to Ubuntu 18 Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
This commit is contained in:
parent
33c0854bda
commit
7d5dca7f85
3 changed files with 8 additions and 8 deletions
|
@ -142,10 +142,10 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore1ESPool-Svc-Public
|
name: NetCore1ESPool-Svc-Public
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
timeoutInMinutes: 180
|
timeoutInMinutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -314,10 +314,10 @@ stages:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore1ESPool-Svc-Public
|
name: NetCore1ESPool-Svc-Public
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
timeoutInMinutes: 180
|
timeoutInMinutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
@ -7,10 +7,10 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore1ESPool-Svc-Public
|
name: NetCore1ESPool-Svc-Public
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
variables:
|
variables:
|
||||||
_BuildConfig: Release
|
_BuildConfig: Release
|
||||||
workspace:
|
workspace:
|
||||||
|
|
|
@ -15,10 +15,10 @@ parameters:
|
||||||
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||||
poolInternal:
|
poolInternal:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
name: NetCore1ESPool-Svc-Internal
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
poolPublic:
|
poolPublic:
|
||||||
name: NetCore1ESPool-Svc-Public
|
name: NetCore1ESPool-Svc-Public
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
tarballDir: $(Build.StagingDirectory)/tarball
|
tarballDir: $(Build.StagingDirectory)/tarball
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
Loading…
Reference in a new issue