Skip to content

[master] Port Internal feeds usage (#12556) #12964

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

Merged
merged 1 commit into from
Aug 19, 2020
Merged

[master] Port Internal feeds usage (#12556) #12964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,41 @@ stages:
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: buildpool.windows.10.amd64.vs2017
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
strategy:
matrix:
${{ if eq(variables['System.TeamProject'], 'public') }}:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Build_Debug:
_BuildConfig: Debug
_PublishType: none
_SignType: test
_Test: -test
Build_Release:
_BuildConfig: Release
${{ if eq(variables['System.TeamProject'], 'public') }}:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
_PublishType: none
_SignType: test
_Test: -test
${{ if ne(variables['System.TeamProject'], 'public') }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
_PublishType: blob
_SignType: real
_Test: ''
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/build.yml
parameters:
agentOs: Windows_NT_FullFramework
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT
strategy:
matrix:
Build_Debug:
Expand All @@ -88,8 +95,12 @@ stages:
parameters:
agentOs: Windows_NT_TestAsTools
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
strategy:
matrix:
Build_Debug:
Expand All @@ -101,9 +112,16 @@ stages:
parameters:
agentOs: Ubuntu_16_04
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
helixTargetQueue: Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1604.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1604.Amd64
strategy:
matrix:
Build_Debug:
Expand All @@ -120,7 +138,10 @@ stages:
agentOs: Darwin
pool:
name: Hosted macOS
helixTargetQueue: OSX.1014.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1014.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1014.Amd64
strategy:
matrix:
Build_Debug:
Expand Down
21 changes: 20 additions & 1 deletion eng/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ jobs:
- _OfficialBuildIdArgs: ''
- _PublishArgs: ''
- _SignArgs: ''
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- _InternalRuntimeDownloadArgs: ''
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-Symbol-Server-PATs
- group: DotNet-HelixApi-Access
- group: dotnet-benchview
Expand All @@ -52,14 +53,29 @@ jobs:
/p:PublishToAzure=$(_PublishToAzure)
- _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
- _PerfIterations: 25

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- group: DotNet-MSRC-Storage
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
steps:
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
- script: eng\CIBuild.cmd
-configuration $(_BuildConfig)
$(_PublishArgs)
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_Test)
$(_InternalRuntimeDownloadArgs)
displayName: Build
env:
BuildConfig: $(_BuildConfig)
Expand Down Expand Up @@ -88,6 +104,7 @@ jobs:
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_Test)
$(_InternalRuntimeDownloadArgs)
displayName: Build
env:
BuildConfig: $(_BuildConfig)
Expand Down Expand Up @@ -118,6 +135,7 @@ jobs:
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_Test)
$(_InternalRuntimeDownloadArgs)
/p:RunTestsAsTool=true
displayName: Build
env:
Expand All @@ -131,6 +149,7 @@ jobs:
$(_PublishArgs)
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_InternalRuntimeDownloadArgs)
displayName: Build
env:
BuildConfig: $(_BuildConfig)
Expand Down