Skip to content

Commit f8ac7ee

Browse files
authored
Merge pull request #19674 from dotnet/dougbu/5.0-preview2/newer.agents.3540
[release/5.0 preview2] Update hosted (AzDO) and BYOC (dnceng) agents used in our builds
2 parents f4bf4bf + c83ad30 commit f8ac7ee

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.azure/pipelines/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ variables:
5656
- group: DotNet-HelixApi-Access
5757
- name: _UseHelixOpenQueues
5858
value: 'false'
59-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
59+
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
6060
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
6161
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
6262
- group: DotNet-Blob-Feed
@@ -76,7 +76,7 @@ variables:
7676
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
7777
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
7878
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
79-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
79+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
8080
- name: _BuildArgs
8181
value: ''
8282
- name: _SignType
@@ -123,10 +123,10 @@ stages:
123123
agentOs: Windows
124124
steps:
125125
- script: "echo ##vso[build.addbuildtag]daily-build"
126-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
126+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
127127
displayName: 'Set CI tags'
128128
- script: "echo ##vso[build.addbuildtag]release-candidate"
129-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
129+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
130130
displayName: 'Set CI tags'
131131

132132
# !!! NOTE !!! Some of these steps have disabled code signing.
@@ -633,7 +633,7 @@ stages:
633633
# Helix x64
634634
- template: jobs/default-build.yml
635635
parameters:
636-
condition: eq(variables['Build.Reason'], 'PullRequest')
636+
condition: in(variables['Build.Reason'], 'PullRequest')
637637
jobName: Helix_x64
638638
jobDisplayName: 'Tests: Helix x64'
639639
agentOs: Windows
@@ -657,7 +657,7 @@ stages:
657657

658658
- template: jobs/default-build.yml
659659
parameters:
660-
condition: ne(variables['Build.Reason'], 'PullRequest')
660+
condition: notin(variables['Build.Reason'], 'PullRequest')
661661
jobName: Helix_x64_daily
662662
jobDisplayName: 'Tests: Helix x64 Daily'
663663
agentOs: Windows
@@ -683,7 +683,7 @@ stages:
683683
# Helix ARM64
684684
- template: jobs/default-build.yml
685685
parameters:
686-
condition: ne(variables['Build.Reason'], 'PullRequest')
686+
condition: notin(variables['Build.Reason'], 'PullRequest')
687687
jobName: Helix_arm64_daily
688688
jobDisplayName: "Tests: Helix ARM64 Daily"
689689
agentOs: Linux
@@ -744,7 +744,7 @@ stages:
744744
displayName: Upload package artifacts
745745
# Only capture source build artifacts in PRs for the sake of inspecting
746746
# changes that impact source-build. The artifacts from this build pipeline are never actually used.
747-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
747+
condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest'))
748748
inputs:
749749
pathtoPublish: artifacts/packages/
750750
artifactName: Source_Build_Packages

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ 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') }}:
@@ -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)