Skip to content

Commit 5ed5c1c

Browse files
committed
Update hosted (AzDO) and BYOC (dnceng) agents used in our builds
- dotnet/aspnetcore-internal#3540 - nit: Consistently use `in` / `notin` with `Build.Reason` - YAML was inconsistent and this aligns w/ the Arcade code
1 parent e81033e commit 5ed5c1c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.azure/pipelines/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ variables:
5252
- name: _InternalRuntimeDownloadCodeSignArgs
5353
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
5454
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
55-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
55+
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
5656
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
5757
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
5858
- group: DotNet-Blob-Feed
@@ -72,7 +72,7 @@ variables:
7272
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
7373
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
7474
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
75-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
75+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
7676
- name: _BuildArgs
7777
value: ''
7878
- name: _SignType
@@ -82,7 +82,7 @@ variables:
8282
# used for post-build phases, internal builds only
8383
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
8484
- group: DotNet-AspNet-SDLValidation-Params
85-
85+
8686
stages:
8787
- stage: build
8888
displayName: Build
@@ -119,10 +119,10 @@ stages:
119119
agentOs: Windows
120120
steps:
121121
- script: "echo ##vso[build.addbuildtag]daily-build"
122-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
122+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
123123
displayName: 'Set CI tags'
124124
- script: "echo ##vso[build.addbuildtag]release-candidate"
125-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
125+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
126126
displayName: 'Set CI tags'
127127

128128
# !!! NOTE !!! Some of these steps have disabled code signing.
@@ -676,7 +676,7 @@ stages:
676676
displayName: Upload package artifacts
677677
# Only capture source build artifacts in PRs for the sake of inspecting
678678
# changes that impact source-build. The artifacts from this build pipeline are never actually used.
679-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
679+
condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest'))
680680
inputs:
681681
pathtoPublish: artifacts/packages/
682682
artifactName: Source_Build_Packages

.azure/pipelines/jobs/default-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ jobs:
8989
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
9090
pool:
9191
${{ if eq(parameters.agentOs, 'macOS') }}:
92-
vmImage: macOS-10.13
92+
vmImage: macOS-10.14
9393
${{ if eq(parameters.agentOs, 'Linux') }}:
9494
vmImage: ubuntu-16.04
9595
${{ if eq(parameters.agentOs, 'Windows') }}:
9696
${{ if eq(variables['System.TeamProject'], 'public') }}:
9797
name: NetCorePublic-Pool
9898
${{ if ne(parameters.isTestingJob, true) }}:
9999
# Visual Studio Build Tools
100-
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
100+
queue: BuildPool.Server.Amd64.VS2019.BT.Open
101101
${{ if eq(parameters.isTestingJob, true) }}:
102102
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
103-
queue: BuildPool.Windows.10.Amd64.VS2019.Open
103+
queue: BuildPool.Server.Amd64.VS2019.Open
104104
${{ if eq(variables['System.TeamProject'], 'internal') }}:
105105
name: NetCoreInternal-Pool
106106
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
107-
queue: BuildPool.Windows.10.Amd64.VS2019
107+
queue: BuildPool.Server.Amd64.VS2019
108108
variables:
109109
- AgentOsName: ${{ parameters.agentOs }}
110110
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@@ -120,9 +120,9 @@ jobs:
120120
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
121121
- _SignType: ''
122122
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
123-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
123+
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
124124
- _SignType: real
125-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
125+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
126126
- _SignType: test
127127
steps:
128128
- checkout: self

0 commit comments

Comments
 (0)