From 8b045db0b507ddf63b658002e20a3b2d3cb2e888 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 19 Feb 2020 16:45:01 -0800 Subject: [PATCH 1/9] Try Windows Server pools with VS2019 Preview --- eng/pipelines/common/global-build-job.yml | 7 +------ eng/pipelines/common/xplat-setup.yml | 4 ++-- eng/pipelines/libraries/base-job.yml | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index b6c357f4563b08..30d854726f5b68 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -25,11 +25,6 @@ jobs: variables: - ${{ each variable in parameters.variables }}: - ${{insert}}: ${{ variable }} - - name: noWarnAsErrorArg - value: '' - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - - name: noWarnAsErrorArg - value: -warnAsError:0 steps: - ${{ if eq(parameters.osGroup, 'OSX') }}: @@ -45,7 +40,7 @@ jobs: - template: /eng/pipelines/common/clone-checkout-bundle-step.yml # Build - - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(noWarnAsErrorArg) ${{ parameters.buildArgs }} + - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} ${{ parameters.buildArgs }} displayName: Build product - task: PublishBuildArtifacts@1 diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 02919c4f384de6..8a00c6eaa64c26 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -90,12 +90,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019 + queue: BuildPool.Windows.10.Amd64.VS2019.Pre # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Open + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 0a7389aa23813a..85ea99f75c30f5 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -102,8 +102,6 @@ jobs: # Windows variables - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - _runtimeOSArg: /p:RuntimeOS=win10 - # Remove when: https://github.com/dotnet/runtime/issues/31888 is fixed. - - _warnAsErrorArg: -warnAsError:0 # Non-Windows variables - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: From cd41c9f6e81ee443baeba320500a856998cc1161 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 20 Feb 2020 14:33:11 -0800 Subject: [PATCH 2/9] Pass parameter to use vs preview pool. --- eng/pipelines/runtime.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 66b42f95206e74..5518a6fc436e8f 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -326,6 +326,7 @@ jobs: - Windows_NT_x86 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -339,6 +340,7 @@ jobs: - Windows_NT_x64 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true # # Libraries Build that only run when libraries is changed # @@ -352,6 +354,7 @@ jobs: - Windows_NT_x86 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -367,6 +370,7 @@ jobs: - Windows_NT_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: true isFullMatrix: ${{ variables.isFullMatrix }} framework: net472 runTests: true @@ -384,6 +388,7 @@ jobs: - Windows_NT_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: true isFullMatrix: ${{ variables.isFullMatrix }} framework: allConfigurations runTests: true From 9e560bd9f72209137436f810e4c3ebf6dd10b25a Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 20 Feb 2020 14:37:35 -0800 Subject: [PATCH 3/9] Use VS2019 Preview Pool when parameter is true --- eng/pipelines/common/xplat-setup.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 8a00c6eaa64c26..956fefed24d973 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -89,13 +89,24 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: - name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre + ${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre + + ${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + ${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + + ${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Open + ${{ if eq(parameters.helixQueuesTemplate, '') }}: ${{ insert }}: ${{ parameters.jobParameters }} From a9ffc0e628b534329af37e3396c3f7e1ecba6a0a Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 20 Feb 2020 14:41:21 -0800 Subject: [PATCH 4/9] Update xplat-setup.yml --- eng/pipelines/common/xplat-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 956fefed24d973..a20601660440d5 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -104,7 +104,7 @@ jobs: queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open ${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}: - name: NetCoreInternal-Pool + name: NetCorePublic-Pool queue: BuildPool.Windows.10.Amd64.VS2019.Open From b7e0c5df73af9f5c25655a168afe7f0befe81f19 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 20 Feb 2020 15:48:46 -0800 Subject: [PATCH 5/9] Update global-build-job.yml --- eng/pipelines/common/global-build-job.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 30d854726f5b68..b6c357f4563b08 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -25,6 +25,11 @@ jobs: variables: - ${{ each variable in parameters.variables }}: - ${{insert}}: ${{ variable }} + - name: noWarnAsErrorArg + value: '' + - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - name: noWarnAsErrorArg + value: -warnAsError:0 steps: - ${{ if eq(parameters.osGroup, 'OSX') }}: @@ -40,7 +45,7 @@ jobs: - template: /eng/pipelines/common/clone-checkout-bundle-step.yml # Build - - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} ${{ parameters.buildArgs }} + - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(noWarnAsErrorArg) ${{ parameters.buildArgs }} displayName: Build product - task: PublishBuildArtifacts@1 From a5b1b13545b1c6b21a6241e620801eb132ab620a Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 20 Feb 2020 17:22:47 -0800 Subject: [PATCH 6/9] PR Feedback --- eng/pipelines/runtime.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 5518a6fc436e8f..91035defd4c912 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -137,6 +137,7 @@ jobs: - Windows_NT_arm64 jobParameters: testGroup: innerloop + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -154,6 +155,7 @@ jobs: - OSX_x64 jobParameters: testGroup: innerloop + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -180,6 +182,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false testGroup: innerloop # @@ -193,6 +196,7 @@ jobs: - Linux_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -219,6 +223,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -246,6 +251,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -274,6 +280,7 @@ jobs: # - Windows_NT_arm64 jobParameters: llvm: true + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -301,6 +308,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false llvm: true condition: >- or( @@ -413,6 +421,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release @@ -426,6 +435,7 @@ jobs: - Linux_musl_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} @@ -442,6 +452,7 @@ jobs: - Linux_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false isOfficialBuild: false liveRuntimeBuildConfig: release testScope: innerloop @@ -465,6 +476,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false liveLibrariesBuildConfig: Release condition: >- or( @@ -485,6 +497,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: Release condition: >- @@ -506,6 +519,7 @@ jobs: - Linux_arm64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- @@ -529,6 +543,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: Release condition: >- @@ -548,6 +563,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- @@ -571,6 +587,7 @@ jobs: - Linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -595,6 +612,7 @@ jobs: - Windows_NT_x86 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -627,6 +645,7 @@ jobs: - Windows_NT_x86 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -652,6 +671,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} @@ -672,6 +692,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} @@ -694,6 +715,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} From 1e7bb365a175846a9685b5b46b9f0845a82988a1 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 21 Feb 2020 12:20:29 +0000 Subject: [PATCH 7/9] Update perf.yml to use right pools. --- eng/pipelines/coreclr/perf.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index ffa22b8afc7515..d25c949d068455 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -52,7 +52,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml + jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - Linux_x64 @@ -60,6 +60,20 @@ jobs: - Windows_NT_x86 jobParameters: testGroup: perf + useVsPreviewPool: false + +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/build-job.yml + buildConfig: release + platforms: + - Linux_x64 + - Windows_NT_x64 + - Windows_NT_x86 + jobParameters: + useVsPreviewPool: true + liveRuntimeBuildConfig: Release + - template: /eng/pipelines/common/platform-matrix.yml parameters: From b369611454dba5f21d43de6d2578b7854618ae52 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 21 Feb 2020 13:01:46 +0000 Subject: [PATCH 8/9] Fix casing of live runtime configuration. --- eng/pipelines/coreclr/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index d25c949d068455..33e8b462bc5d87 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -72,7 +72,7 @@ jobs: - Windows_NT_x86 jobParameters: useVsPreviewPool: true - liveRuntimeBuildConfig: Release + liveRuntimeBuildConfig: release - template: /eng/pipelines/common/platform-matrix.yml From a5e77f24021aaa9e8164e60d6771e2bad5d3aebb Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Mon, 24 Feb 2020 16:57:50 +0000 Subject: [PATCH 9/9] Libraries build configuration upper case --- eng/pipelines/coreclr/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 33e8b462bc5d87..e9782e257a1e07 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -65,7 +65,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/libraries/build-job.yml - buildConfig: release + buildConfig: Release platforms: - Linux_x64 - Windows_NT_x64