From 9acdbc7fde7d63c6d6eb1e3976935ca22ce8207f Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 4 Dec 2019 21:03:03 +0100 Subject: [PATCH 1/8] Switch over CoreCLR pr.yml to use live-built libraries --- eng/pipelines/coreclr/pr.yml | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/eng/pipelines/coreclr/pr.yml b/eng/pipelines/coreclr/pr.yml index 7421bade2b0e1c..55c8056d8f1c5c 100644 --- a/eng/pipelines/coreclr/pr.yml +++ b/eng/pipelines/coreclr/pr.yml @@ -42,6 +42,20 @@ jobs: jobParameters: testGroup: innerloop +# +# Debug library builds +# +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/build-job.yml + buildConfig: Debug + platforms: + - Windows_NT_x64 + - Windows_NT_x86 + jobParameters: + isOfficialBuild: false + liveCoreClrBuildConfig: debug + # # Checked builds # @@ -79,6 +93,27 @@ jobs: jobParameters: testGroup: innerloop +# +# Release library builds +# +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/build-job.yml + buildConfig: Release + platforms: + - Linux_arm + - Linux_arm64 + - Linux_musl_x64 + - Linux_x64 + - OSX_x64 + - Windows_NT_arm + - Windows_NT_arm64 + - Windows_NT_x64 + - Windows_NT_x86 + jobParameters: + isOfficialBuild: false + liveCoreClrBuildConfig: checked + # # Checked test builds # @@ -96,6 +131,7 @@ jobs: - Windows_NT_x86 jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Checked JIT test executions @@ -118,6 +154,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Checked R2R test executions @@ -137,6 +174,7 @@ jobs: testGroup: innerloop readyToRun: true displayNameArgs: R2R + liveLibrariesBuildConfig: Release # # CoreFX test runs against CoreCLR @@ -154,6 +192,7 @@ jobs: testGroup: innerloop corefxTests: true displayNameArgs: CoreFX + liveLibrariesBuildConfig: Release # # Crossgen-comparison jobs @@ -178,6 +217,7 @@ jobs: - OSX_x64 jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Release test builds @@ -192,6 +232,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Formatting From 62c1ab091a7647a34cf3a5fd048f4ecbf6949276 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 4 Dec 2019 21:16:00 +0100 Subject: [PATCH 2/8] Delete CoreFX runs against CoreCLR --- eng/pipelines/coreclr/pr.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/eng/pipelines/coreclr/pr.yml b/eng/pipelines/coreclr/pr.yml index 55c8056d8f1c5c..03f6614c9d7fea 100644 --- a/eng/pipelines/coreclr/pr.yml +++ b/eng/pipelines/coreclr/pr.yml @@ -176,24 +176,6 @@ jobs: displayNameArgs: R2R liveLibrariesBuildConfig: Release -# -# CoreFX test runs against CoreCLR -# -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml - buildConfig: checked - platforms: - - Linux_x64 - - Windows_NT_x64 - helixQueueGroup: pr - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: innerloop - corefxTests: true - displayNameArgs: CoreFX - liveLibrariesBuildConfig: Release - # # Crossgen-comparison jobs # From b4e49a6874437af7b6bfc552a0cab400029cd0e8 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 5 Dec 2019 16:08:15 +0100 Subject: [PATCH 3/8] PR feedback - only use release CoreFX builds for CoreCLR testing --- eng/pipelines/coreclr/pr.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/eng/pipelines/coreclr/pr.yml b/eng/pipelines/coreclr/pr.yml index 03f6614c9d7fea..fbfa2b6d5881e3 100644 --- a/eng/pipelines/coreclr/pr.yml +++ b/eng/pipelines/coreclr/pr.yml @@ -42,20 +42,6 @@ jobs: jobParameters: testGroup: innerloop -# -# Debug library builds -# -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/libraries/build-job.yml - buildConfig: Debug - platforms: - - Windows_NT_x64 - - Windows_NT_x86 - jobParameters: - isOfficialBuild: false - liveCoreClrBuildConfig: debug - # # Checked builds # From 3c028d7dd1ca21582bff863b79f59b10576f9f46 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 5 Dec 2019 17:25:24 +0100 Subject: [PATCH 4/8] Remove OSSubgroup from CoreFX build artifact name --- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index b36cad5bf86bce..3436f8ac04c7d2 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -109,7 +109,7 @@ jobs: - librariesDownloadDir: '' - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - - librariesArtifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} + - librariesArtifactName: ${{ format('libraries_bin_netcoreapp_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - librariesDownloadDir: $(Build.SourcesDirectory)/artifacts - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - librariesOverrideArg: ' localcorefxpath $(Build.SourcesDirectory) localcorefxconfig ${{ parameters.liveLibrariesBuildConfig }}' From 7c934fdea41230fe1dc5564443e547e0174f60c3 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 5 Dec 2019 19:41:29 +0100 Subject: [PATCH 5/8] Clean up propagation of library artifacts per Santi's feedback --- eng/pipelines/common/xplat-setup.yml | 3 +++ eng/pipelines/coreclr/templates/build-test-job.yml | 4 ++-- eng/pipelines/coreclr/templates/run-test-job.yml | 4 ++-- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 2 -- eng/pipelines/libraries/build-job.yml | 2 +- eng/pipelines/libraries/build-test-job.yml | 6 +++--- eng/pipelines/libraries/run-test-job.yml | 8 ++++---- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 64294b580e8625..753056ad2683d5 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -49,6 +49,9 @@ jobs: osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} + librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + ${{ if ne(parameters.container, '') }}: ${{ if eq(parameters.container.registry, 'mcr') }}: container: ${{ format('{0}:{1}', 'mcr.microsoft.com/dotnet-buildtools/prereqs', parameters.container.image) }} diff --git a/eng/pipelines/coreclr/templates/build-test-job.yml b/eng/pipelines/coreclr/templates/build-test-job.yml index 15f8668b8e9aa2..d264587225b6d0 100644 --- a/eng/pipelines/coreclr/templates/build-test-job.yml +++ b/eng/pipelines/coreclr/templates/build-test-job.yml @@ -94,8 +94,8 @@ jobs: parameters: unpackFolder: $(librariesDownloadDir) cleanUnpackFolder: false - artifactFileName: '$(librariesArtifactName)$(archiveExtension)' - artifactName: '$(librariesArtifactName)' + artifactFileName: '$(librariesBuildArtifactName)$(archiveExtension)' + artifactName: '$(librariesBuildArtifactName)' displayName: 'live-built libraries' diff --git a/eng/pipelines/coreclr/templates/run-test-job.yml b/eng/pipelines/coreclr/templates/run-test-job.yml index bf854e1af11d11..c89d7a0d3590b8 100644 --- a/eng/pipelines/coreclr/templates/run-test-job.yml +++ b/eng/pipelines/coreclr/templates/run-test-job.yml @@ -114,8 +114,8 @@ jobs: parameters: unpackFolder: $(librariesDownloadDir) cleanUnpackFolder: false - artifactFileName: '$(librariesArtifactName)$(archiveExtension)' - artifactName: '$(librariesArtifactName)' + artifactFileName: '$(librariesBuildArtifactName)$(archiveExtension)' + artifactName: '$(librariesBuildArtifactName)' displayName: 'live-built libraries' diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 3436f8ac04c7d2..414b76fdcab6a9 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -104,12 +104,10 @@ jobs: - name: priorityArg value: '-priority=1' - - librariesArtifactName: '' - librariesOverrideArg: '' - librariesDownloadDir: '' - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - - librariesArtifactName: ${{ format('libraries_bin_netcoreapp_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - librariesDownloadDir: $(Build.SourcesDirectory)/artifacts - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - librariesOverrideArg: ' localcorefxpath $(Build.SourcesDirectory) localcorefxconfig ${{ parameters.liveLibrariesBuildConfig }}' diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 9d2711d8bd4669..36dd396f1c7768 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -130,7 +130,7 @@ jobs: archiveType: $(archiveType) archiveExtension: $(archiveExtension) tarCompression: $(tarCompression) - artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + artifactName: $(librariesBuildArtifactName) displayName: Build Assets - ${{ if eq(parameters.runTests, true) }}: diff --git a/eng/pipelines/libraries/build-test-job.yml b/eng/pipelines/libraries/build-test-job.yml index f7a91d45b97a06..c7e9a22aadeb88 100644 --- a/eng/pipelines/libraries/build-test-job.yml +++ b/eng/pipelines/libraries/build-test-job.yml @@ -46,8 +46,8 @@ jobs: - template: /eng/pipelines/common/download-artifact-step.yml parameters: displayName: Build Assets - artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - artifactFileName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}$(archiveExtension) + artifactName: $(librariesBuildArtifactName) + artifactFileName: $(librariesBuildArtifactName)$(archiveExtension) unpackFolder: $(Build.SourcesDirectory)/artifacts cleanUnpackFolder: false @@ -67,5 +67,5 @@ jobs: archiveType: $(archiveType) archiveExtension: $(archiveExtension) tarCompression: $(tarCompression) - artifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.archType, parameters.buildConfig) }} + artifactName: $(librariesTestsArtifactName) displayName: Test Assets diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index b662732c9d906e..7dbdad78129644 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -44,8 +44,8 @@ jobs: - template: /eng/pipelines/common/download-artifact-step.yml parameters: displayName: Build Assets - artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - artifactFileName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}$(archiveExtension) + artifactName: $(librariesBuildArtifactName) + artifactFileName: $(librariesBuildArtifactName)$(archiveExtension) unpackFolder: $(Build.SourcesDirectory)/artifacts - template: /eng/pipelines/common/download-artifact-step.yml @@ -53,8 +53,8 @@ jobs: displayName: Test Assets cleanUnpackFolder: false unpackFolder: $(Build.SourcesDirectory)/artifacts - artifactName: ${{ format('libraries_test_assets_{0}_{1}_x64_{2}', parameters.framework, parameters.osGroup, parameters.dependsOnBuildConfiguration) }} - artifactFileName: ${{ format('libraries_test_assets_{0}_{1}_x64_{2}', parameters.framework, parameters.osGroup, parameters.dependsOnBuildConfiguration) }}$(archiveExtension) + artifactName: $(librariesTestsArtifactName) + artifactFileName: $(librariesTestsArtifactName)$(archiveExtension) - template: /eng/pipelines/libraries/helix.yml parameters: From f84dccd972b270373d03114f04ac6727bdcfe8a3 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 5 Dec 2019 19:45:04 +0100 Subject: [PATCH 6/8] Fix typo in placement of the artifact names (thanks Santi for spotting!) --- eng/pipelines/common/xplat-setup.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 753056ad2683d5..f25ca4909e1a04 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -44,14 +44,14 @@ jobs: # This is only required for cross builds. - name: ROOTFS_DIR value: ${{ parameters.jobParameters.crossrootfsDir }} - + + - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if ne(parameters.container, '') }}: ${{ if eq(parameters.container.registry, 'mcr') }}: container: ${{ format('{0}:{1}', 'mcr.microsoft.com/dotnet-buildtools/prereqs', parameters.container.image) }} From a6e6b28e5f45df9d2dc5d273df3515733cbab0bd Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 5 Dec 2019 22:20:50 +0100 Subject: [PATCH 7/8] Make xplat-setup aware of buildConfig This is needed so that the library name artifacts are properly synthesized. This extra delta is somewhat noisy but hopefully trivial. Thanks Tomas --- eng/pipelines/common/platform-matrix.yml | 24 +++++++++---------- eng/pipelines/common/xplat-setup.yml | 4 +++- .../coreclr/templates/helix-queues-setup.yml | 2 ++ .../libraries/helix-queues-setup.yml | 2 ++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 0684003abe6ab1..7b96d6a039e18a 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -32,13 +32,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: arm + buildConfig: ${{ parameters.buildConfig }} platform: Linux_arm container: image: ubuntu-16.04-cross-14.04-23cacb0-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm' @@ -53,13 +53,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: arm64 + buildConfig: ${{ parameters.buildConfig }} platform: Linux_arm64 container: image: ubuntu-16.04-cross-arm64-cfdd435-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' @@ -75,13 +75,13 @@ jobs: osGroup: Linux osSubgroup: _musl archType: x64 + buildConfig: ${{ parameters.buildConfig }} platform: Linux_musl_x64 container: image: alpine-3.9-WithNode-0fc54a3-20190918214015 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ if ne(parameters.managedOsxBuild, true) }}: managedTestBuildOsGroup: Linux @@ -100,13 +100,13 @@ jobs: osGroup: Linux osSubgroup: _musl archType: arm64 + buildConfig: ${{ parameters.buildConfig }} platform: Linux_musl_arm64 container: image: ubuntu-16.04-cross-arm64-alpine-406629a-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' @@ -121,13 +121,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: x64 + buildConfig: ${{ parameters.buildConfig }} platform: Linux_x64 container: image: centos-7-f39df28-20191023143754 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ if ne(parameters.managedOsxBuild, true) }}: managedTestBuildOsGroup: Linux @@ -142,13 +142,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: WebAssembly archType: wasm + buildConfig: ${{ parameters.buildConfig }} platform: WebAssembly_wasm container: image: ubuntu-16.04-a50a721-20191023143845 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} ${{ insert }}: ${{ parameters.jobParameters }} # FreeBSD @@ -161,8 +161,8 @@ jobs: # jobTemplate: ${{ parameters.jobTemplate }} # osGroup: FreeBSD # archType: x64 +# buildConfig: ${{ parameters.buildConfig }} # jobParameters: -# buildConfig: ${{ parameters.buildConfig }} # # There are no FreeBSD helix queues, so we don't run tests at the moment. # helixQueues: # asString: '' @@ -178,10 +178,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: OSX archType: x64 + buildConfig: ${{ parameters.buildConfig }} platform: OSX_x64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} @@ -195,10 +195,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: x64 + buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_x64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -212,10 +212,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: x86 + buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_x86 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -229,9 +229,9 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: arm + buildConfig: ${{ parameters.buildConfig }} jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -245,10 +245,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: arm64 + buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_arm64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} - buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index f25ca4909e1a04..246f636117386f 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -3,6 +3,7 @@ parameters: osGroup: '' osSubgroup: '' archType: '' + buildConfig: '' container: '' helixQueuesTemplate: '' platform: '' @@ -50,7 +51,8 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} - archType: ${{ parameters.archType }} + archType: ${{ parameters.archType }} + buildConfig: ${{ parameters.buildConfig }} ${{ if ne(parameters.container, '') }}: ${{ if eq(parameters.container.registry, 'mcr') }}: diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index c6f87e187e0493..0e8b867451e312 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -3,6 +3,7 @@ parameters: variables: {} osGroup: '' osSubgroup: '' + buildConfig: '' archType: '' container: '' pool: '' @@ -16,6 +17,7 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} + buildConfig: ${{ parameters.buildConfig }} container: ${{ parameters.container }} pool: ${{ parameters.pool }} helixQueues: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 49f576184a36a0..c5580ade2c5698 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -4,6 +4,7 @@ parameters: osGroup: '' osSubgroup: '' archType: '' + buildConfig: '' container: '' pool: '' platform: '' @@ -16,6 +17,7 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} + buildConfig: ${{ parameters.buildConfig }} container: ${{ parameters.container }} pool: ${{ parameters.pool }} helixQueues: From 9a5f05a5f002f89d1ab9dbe52fb69e31f6458a3c Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 6 Dec 2019 00:30:40 +0100 Subject: [PATCH 8/8] Rollback cleanup of library artifact naming as it doesn't work --- eng/pipelines/common/platform-matrix.yml | 24 +++++++++---------- eng/pipelines/common/xplat-setup.yml | 5 ---- .../coreclr/templates/helix-queues-setup.yml | 2 -- .../coreclr/templates/xplat-pipeline-job.yml | 2 ++ eng/pipelines/libraries/base-job.yml | 3 +++ .../libraries/helix-queues-setup.yml | 2 -- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 7b96d6a039e18a..0684003abe6ab1 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -32,13 +32,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: arm - buildConfig: ${{ parameters.buildConfig }} platform: Linux_arm container: image: ubuntu-16.04-cross-14.04-23cacb0-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm' @@ -53,13 +53,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: arm64 - buildConfig: ${{ parameters.buildConfig }} platform: Linux_arm64 container: image: ubuntu-16.04-cross-arm64-cfdd435-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' @@ -75,13 +75,13 @@ jobs: osGroup: Linux osSubgroup: _musl archType: x64 - buildConfig: ${{ parameters.buildConfig }} platform: Linux_musl_x64 container: image: alpine-3.9-WithNode-0fc54a3-20190918214015 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ if ne(parameters.managedOsxBuild, true) }}: managedTestBuildOsGroup: Linux @@ -100,13 +100,13 @@ jobs: osGroup: Linux osSubgroup: _musl archType: arm64 - buildConfig: ${{ parameters.buildConfig }} platform: Linux_musl_arm64 container: image: ubuntu-16.04-cross-arm64-alpine-406629a-20191023143847 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' @@ -121,13 +121,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Linux archType: x64 - buildConfig: ${{ parameters.buildConfig }} platform: Linux_x64 container: image: centos-7-f39df28-20191023143754 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ if ne(parameters.managedOsxBuild, true) }}: managedTestBuildOsGroup: Linux @@ -142,13 +142,13 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: WebAssembly archType: wasm - buildConfig: ${{ parameters.buildConfig }} platform: WebAssembly_wasm container: image: ubuntu-16.04-a50a721-20191023143845 registry: mcr jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} ${{ insert }}: ${{ parameters.jobParameters }} # FreeBSD @@ -161,8 +161,8 @@ jobs: # jobTemplate: ${{ parameters.jobTemplate }} # osGroup: FreeBSD # archType: x64 -# buildConfig: ${{ parameters.buildConfig }} # jobParameters: +# buildConfig: ${{ parameters.buildConfig }} # # There are no FreeBSD helix queues, so we don't run tests at the moment. # helixQueues: # asString: '' @@ -178,10 +178,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: OSX archType: x64 - buildConfig: ${{ parameters.buildConfig }} platform: OSX_x64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} @@ -195,10 +195,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: x64 - buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_x64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -212,10 +212,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: x86 - buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_x86 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -229,9 +229,9 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: arm - buildConfig: ${{ parameters.buildConfig }} jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} @@ -245,10 +245,10 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: arm64 - buildConfig: ${{ parameters.buildConfig }} platform: Windows_NT_arm64 jobParameters: stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 246f636117386f..74bf515f4d47a9 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -3,7 +3,6 @@ parameters: osGroup: '' osSubgroup: '' archType: '' - buildConfig: '' container: '' helixQueuesTemplate: '' platform: '' @@ -46,13 +45,9 @@ jobs: - name: ROOTFS_DIR value: ${{ parameters.jobParameters.crossrootfsDir }} - - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} - buildConfig: ${{ parameters.buildConfig }} ${{ if ne(parameters.container, '') }}: ${{ if eq(parameters.container.registry, 'mcr') }}: diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 0e8b867451e312..c6f87e187e0493 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -3,7 +3,6 @@ parameters: variables: {} osGroup: '' osSubgroup: '' - buildConfig: '' archType: '' container: '' pool: '' @@ -17,7 +16,6 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} - buildConfig: ${{ parameters.buildConfig }} container: ${{ parameters.container }} pool: ${{ parameters.pool }} helixQueues: diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 414b76fdcab6a9..e0c1eeaaf190df 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -104,10 +104,12 @@ jobs: - name: priorityArg value: '-priority=1' + - librariesBuildArtifactName: '' - librariesOverrideArg: '' - librariesDownloadDir: '' - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: + - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - librariesDownloadDir: $(Build.SourcesDirectory)/artifacts - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - librariesOverrideArg: ' localcorefxpath $(Build.SourcesDirectory) localcorefxconfig ${{ parameters.liveLibrariesBuildConfig }}' diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index ddedf9172357e2..ef9400b859824a 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -64,6 +64,9 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, 'true') }}: - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber) + - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + - _coreClrArtifactName: '' - _coreClrDownloadPath: '' - _coreClrOverridePathArg: '' diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index c5580ade2c5698..49f576184a36a0 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -4,7 +4,6 @@ parameters: osGroup: '' osSubgroup: '' archType: '' - buildConfig: '' container: '' pool: '' platform: '' @@ -17,7 +16,6 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} - buildConfig: ${{ parameters.buildConfig }} container: ${{ parameters.container }} pool: ${{ parameters.pool }} helixQueues: