From 7e856375fa6acca24eda6c29b7b0b76e81032d10 Mon Sep 17 00:00:00 2001 From: Lukas Lansky Date: Mon, 20 Jul 2020 13:07:12 +0200 Subject: [PATCH 1/4] Add internal feed build steps --- eng/build.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eng/build.yml b/eng/build.yml index 4d8274a3c1c1..6cb8c7d442f6 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -52,7 +52,19 @@ jobs: /p:PublishToAzure=$(_PublishToAzure) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 + - 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) @@ -60,6 +72,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -88,6 +101,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -118,6 +132,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) /p:RunTestsAsTool=true displayName: Build env: @@ -131,6 +146,7 @@ jobs: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) From b0be006a102e71e8b0986459951cb8f7f4b7b9b9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 21 Jul 2020 12:47:51 -0700 Subject: [PATCH 2/4] Fixup some conditionals --- .vsts-ci.yml | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3b8c5d88ab1d..346fd082fcfb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -43,11 +43,11 @@ 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 @@ -55,22 +55,29 @@ stages: _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: @@ -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: @@ -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: @@ -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: From ff899337c5bbc6dbbb7e61a090b6ed2e29e18534 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 21 Jul 2020 13:18:16 -0700 Subject: [PATCH 3/4] Fixup some additional conditionals --- eng/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 6cb8c7d442f6..d38c1fc69550 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -36,7 +36,7 @@ jobs: - _OfficialBuildIdArgs: '' - _PublishArgs: '' - _SignArgs: '' - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access - group: dotnet-benchview @@ -52,6 +52,8 @@ 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 From 68c8241819ed023293a15b9bf8f3405e7d638c4b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 21 Jul 2020 13:31:08 -0700 Subject: [PATCH 4/4] Add default value for _InternalRuntimeDownloadArgs --- eng/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/build.yml b/eng/build.yml index d38c1fc69550..545d16f4d243 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -36,6 +36,7 @@ jobs: - _OfficialBuildIdArgs: '' - _PublishArgs: '' - _SignArgs: '' + - _InternalRuntimeDownloadArgs: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access