From f621f44cfad59eade2d263a19f39f38f7dc4a51b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Fri, 6 Dec 2019 16:56:17 +0100 Subject: [PATCH] Switch over CoreCLR pr.yml to use live-built libraries (#520) * Switch over CoreCLR pr.yml to use live-built libraries * Delete CoreFX runs against CoreCLR * PR feedback - only use release CoreFX builds for CoreCLR testing --- eng/pipelines/common/xplat-setup.yml | 4 +-- eng/pipelines/coreclr/pr.yml | 41 +++++++++++++--------- eng/pipelines/coreclr/templates/build-test-job.yml | 4 +-- eng/pipelines/coreclr/templates/run-test-job.yml | 4 +-- .../coreclr/templates/xplat-pipeline-job.yml | 4 +-- eng/pipelines/libraries/base-job.yml | 3 ++ eng/pipelines/libraries/build-job.yml | 2 +- eng/pipelines/libraries/build-test-job.yml | 6 ++-- eng/pipelines/libraries/run-test-job.yml | 8 ++--- 9 files changed, 44 insertions(+), 32 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 64294b5..74bf515 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -44,10 +44,10 @@ jobs: # This is only required for cross builds. - name: ROOTFS_DIR value: ${{ parameters.jobParameters.crossrootfsDir }} - + osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} - archType: ${{ parameters.archType }} + archType: ${{ parameters.archType }} ${{ if ne(parameters.container, '') }}: ${{ if eq(parameters.container.registry, 'mcr') }}: diff --git a/eng/pipelines/coreclr/pr.yml b/eng/pipelines/coreclr/pr.yml index 7421bad..fbfa2b6 100644 --- a/eng/pipelines/coreclr/pr.yml +++ b/eng/pipelines/coreclr/pr.yml @@ -80,66 +80,70 @@ jobs: testGroup: innerloop # -# Checked test builds +# Release library builds # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml - buildConfig: checked + 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: - testGroup: innerloop + isOfficialBuild: false + liveCoreClrBuildConfig: checked # -# Checked JIT test executions +# Checked test builds # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml buildConfig: checked platforms: - Linux_arm - Linux_arm64 - - Linux_musl_x64 - - Linux_x64 - OSX_x64 - Windows_NT_arm - Windows_NT_arm64 - Windows_NT_x64 - Windows_NT_x86 - helixQueueGroup: pr - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # -# Checked R2R test executions +# Checked JIT test executions # - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml buildConfig: checked platforms: + - Linux_arm + - Linux_arm64 + - Linux_musl_x64 - Linux_x64 - OSX_x64 + - Windows_NT_arm + - Windows_NT_arm64 - Windows_NT_x64 - Windows_NT_x86 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop - readyToRun: true - displayNameArgs: R2R + liveLibrariesBuildConfig: Release # -# CoreFX test runs against CoreCLR +# Checked R2R test executions # - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -147,13 +151,16 @@ jobs: buildConfig: checked platforms: - Linux_x64 + - OSX_x64 - Windows_NT_x64 + - Windows_NT_x86 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop - corefxTests: true - displayNameArgs: CoreFX + readyToRun: true + displayNameArgs: R2R + liveLibrariesBuildConfig: Release # # Crossgen-comparison jobs @@ -178,6 +185,7 @@ jobs: - OSX_x64 jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Release test builds @@ -192,6 +200,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: innerloop + liveLibrariesBuildConfig: Release # # Formatting diff --git a/eng/pipelines/coreclr/templates/build-test-job.yml b/eng/pipelines/coreclr/templates/build-test-job.yml index 15f8668..d264587 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 bf854e1..c89d7a0 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 b36cad5..e0c1eea 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -104,12 +104,12 @@ jobs: - name: priorityArg value: '-priority=1' - - librariesArtifactName: '' + - librariesBuildArtifactName: '' - librariesOverrideArg: '' - librariesDownloadDir: '' - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - - librariesArtifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, 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 ddedf91..ef9400b 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/build-job.yml b/eng/pipelines/libraries/build-job.yml index 9d2711d..36dd396 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 f7a91d4..c7e9a22 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 b662732..7dbdad7 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: -- 2.7.4