huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19675 from dotnet/dougbu/3.1/newer.agents.3540 

[release/3.1] Update hosted (AzDO) and BYOC (dnceng) agents used in our builds
This commit is contained in:
Doug Bunting 2020-03-25 12:56:53 -07:00 committed by GitHub
parent 9ed8fbe452 5ed5c1c46b
commit 7582cfc593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.azure/pipelines/ci.yml
View File

@ -52,7 +52,7 @@ variables:
- name: _InternalRuntimeDownloadCodeSignArgs - name: _InternalRuntimeDownloadCodeSignArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1 # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
- group: DotNet-Blob-Feed - group: DotNet-Blob-Feed
@ -72,7 +72,7 @@ variables:
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: _BuildArgs - name: _BuildArgs
value: '' value: ''
- name: _SignType - name: _SignType
@ -82,7 +82,7 @@ variables:
# used for post-build phases, internal builds only # used for post-build phases, internal builds only
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-AspNet-SDLValidation-Params - group: DotNet-AspNet-SDLValidation-Params
stages: stages:
- stage: build - stage: build
displayName: Build displayName: Build
@ -119,10 +119,10 @@ stages:
agentOs: Windows agentOs: Windows
steps: steps:
- script: "echo ##vso[build.addbuildtag]daily-build" - script: "echo ##vso[build.addbuildtag]daily-build"
condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) condition: and(notin(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
displayName: 'Set CI tags' displayName: 'Set CI tags'
- script: "echo ##vso[build.addbuildtag]release-candidate" - script: "echo ##vso[build.addbuildtag]release-candidate"
condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) condition: and(notin(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
displayName: 'Set CI tags' displayName: 'Set CI tags'
# !!! NOTE !!! Some of these steps have disabled code signing. # !!! NOTE !!! Some of these steps have disabled code signing.
@ -676,7 +676,7 @@ stages:
displayName: Upload package artifacts displayName: Upload package artifacts
# Only capture source build artifacts in PRs for the sake of inspecting # Only capture source build artifacts in PRs for the sake of inspecting
# changes that impact source-build. The artifacts from this build pipeline are never actually used. # changes that impact source-build. The artifacts from this build pipeline are never actually used.
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest')) condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest'))
inputs: inputs:
pathtoPublish: artifacts/packages/ pathtoPublish: artifacts/packages/
artifactName: Source_Build_Packages artifactName: Source_Build_Packages

12
.azure/pipelines/jobs/default-build.yml
View File

@ -89,7 +89,7 @@ jobs:
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
pool: pool:
${{ if eq(parameters.agentOs, 'macOS') }}: ${{ if eq(parameters.agentOs, 'macOS') }}:
vmImage: macOS-10.13 vmImage: macOS-10.14
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(parameters.agentOs, 'Windows') }}:
@ -97,14 +97,14 @@ jobs:
name: NetCorePublic-Pool name: NetCorePublic-Pool
${{ if ne(parameters.isTestingJob, true) }}: ${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools # Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open queue: BuildPool.Server.Amd64.VS2019.BT.Open
${{ if eq(parameters.isTestingJob, true) }}: ${{ if eq(parameters.isTestingJob, true) }}:
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019.Open queue: BuildPool.Server.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool name: NetCoreInternal-Pool
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019 queue: BuildPool.Server.Amd64.VS2019
variables: variables:
- AgentOsName: ${{ parameters.agentOs }} - AgentOsName: ${{ parameters.agentOs }}
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@ -120,9 +120,9 @@ jobs:
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
- _SignType: '' - _SignType: ''
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}: - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: real - _SignType: real
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: test - _SignType: test
steps: steps:
- checkout: self - checkout: self