From b35bdbe4f0a8c2f8bc9c0e4a9259af25aaeaef78 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 18 Nov 2021 11:34:12 -0800 Subject: [PATCH 1/9] Revert "Revert "Actually use TargetOS=AnyOS in the build-test-job. (#61745)" (#61799)" This reverts commit ca24ab040b48f4fc0f1bd5e7d2342f42c8bb5ebb. --- .../common/templates/runtimes/build-test-job.yml | 8 ++++++-- src/tests/build.proj | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 562b426eebc1fd..9c17307ed47202 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -89,9 +89,13 @@ jobs: - ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} + - name: liveRuntimeArtifactsPathArg + value: ${{ format('/p:CoreCLROverridePath={0}/artifacts/bin/coreclr/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} + - name: liveRuntimeArtifactsPathArg + value: ${{ format('/p:MonoOverridePath={0}/artifacts/bin/mono/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: @@ -135,7 +139,7 @@ jobs: displayName: Disk Usage before Build # Build managed test components - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) /p:RuntimeOS=${{ parameters.osGroup }}${{ parameters.osSubgroup }} /p:LibrariesTargetOSConfigurationArchitecture=${{ parameters.osGroup }}${{ parameters.osSubgroup }}-${{ parameters.liveLibrariesBuildConfig }}-${{ parameters.archType }} $(liveRuntimeArtifactsPathArg) /p:TargetOS=AnyOS displayName: Build managed test components - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: @@ -147,7 +151,7 @@ jobs: # Zip and publish managed test components - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(managedTestArtifactRootFolderPath) + rootFolder: '$(binTestsPath)/AnyOS.$(archType).$(buildConfigUpper)' includeRootFolder: false archiveExtension: '.tar.gz' archiveType: tar diff --git a/src/tests/build.proj b/src/tests/build.proj index e0a2bac2d36f5c..e2e7f995e8c2eb 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -394,8 +394,6 @@ - @@ -450,7 +448,9 @@ $(GroupBuildCmd) "/p:TargetArchitecture=$(TargetArchitecture)" $(GroupBuildCmd) "/p:Configuration=$(Configuration)" $(GroupBuildCmd) "/p:LibrariesConfiguration=$(LibrariesConfiguration)" + $(GroupBuildCmd) "/p:LibrariesTargetOSConfigurationArchitecture=$(LibrariesTargetOSConfigurationArchitecture)" $(GroupBuildCmd) "/p:TargetOS=$(TargetOS)" + $(GroupBuildCmd) "/p:RuntimeOS=$(RuntimeOS)" $(GroupBuildCmd) "/p:RuntimeFlavor=$(RuntimeFlavor)" $(GroupBuildCmd) "/p:RuntimeVariant=$(RuntimeVariant)" $(GroupBuildCmd) "/p:CLRTestBuildAllTargets=$(CLRTestBuildAllTargets)" @@ -458,6 +458,7 @@ $(GroupBuildCmd) "/p:__SkipRestorePackages=1" $(GroupBuildCmd) /nodeReuse:false $(GroupBuildCmd) /maxcpucount + $(GroupBuildCmd) /bl:$(ArtifactsDir)/log/$(Configuration)/InnerManagedTestBuild.$(__TestGroupToBuild).binlog From 2bd9f736b2f954148386b66e72173867e0599003 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 18 Nov 2021 11:35:22 -0800 Subject: [PATCH 2/9] Try using just the variable name in format() --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 9c17307ed47202..f05eea790d7d02 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -90,12 +90,12 @@ jobs: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:CoreCLROverridePath={0}/artifacts/bin/coreclr/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:CoreCLROverridePath={0}/artifacts/bin/coreclr/{1}{2}.{3}.{4}', Build.SourcesDirectory, parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:MonoOverridePath={0}/artifacts/bin/mono/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:MonoOverridePath={0}/artifacts/bin/mono/{1}{2}.{3}.{4}', Build.SourcesDirectory, parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: From 0866b6e64a98a05348482c8a3f812740920d1ffe Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 18 Nov 2021 11:40:30 -0800 Subject: [PATCH 3/9] Put Build.SourcesDirectory into the formatted text directly. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index f05eea790d7d02..c1f5442e04744d 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -90,12 +90,12 @@ jobs: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:CoreCLROverridePath={0}/artifacts/bin/coreclr/{1}{2}.{3}.{4}', Build.SourcesDirectory, parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:MonoOverridePath={0}/artifacts/bin/mono/{1}{2}.{3}.{4}', Build.SourcesDirectory, parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:MonoOverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: From bb4662330f27e80f5db0761a8e3f746bfe6e682c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 18 Nov 2021 14:47:41 -0800 Subject: [PATCH 4/9] Forward override paths down to the inner builds. --- src/tests/build.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tests/build.proj b/src/tests/build.proj index e2e7f995e8c2eb..aff9b1a19371d0 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -449,6 +449,8 @@ $(GroupBuildCmd) "/p:Configuration=$(Configuration)" $(GroupBuildCmd) "/p:LibrariesConfiguration=$(LibrariesConfiguration)" $(GroupBuildCmd) "/p:LibrariesTargetOSConfigurationArchitecture=$(LibrariesTargetOSConfigurationArchitecture)" + $(GroupBuildCmd) "/p:CoreCLROverridePath=$(CoreCLROverridePath)" + $(GroupBuildCmd) "/p:MonoOverridePath=$(MonoOverridePath)" $(GroupBuildCmd) "/p:TargetOS=$(TargetOS)" $(GroupBuildCmd) "/p:RuntimeOS=$(RuntimeOS)" $(GroupBuildCmd) "/p:RuntimeFlavor=$(RuntimeFlavor)" From ce3ad386f593b027841b254c40684e0809ba7027 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Nov 2021 10:23:44 -0800 Subject: [PATCH 5/9] Fix System.Private.CoreLib reference to use the livebuilds paths. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 +- src/tests/Common/override.targets | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index c1f5442e04744d..31cfbc43bad3ef 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -90,7 +90,7 @@ jobs: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/coreclr/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} diff --git a/src/tests/Common/override.targets b/src/tests/Common/override.targets index 0586ffe389928b..deaddcc4c0fb61 100644 --- a/src/tests/Common/override.targets +++ b/src/tests/Common/override.targets @@ -14,7 +14,8 @@ > - + + From 984f46ad3a0d9819d1695d9a3e161d8b017e8238 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Nov 2021 11:48:02 -0800 Subject: [PATCH 6/9] Fix casing for configs. --- eng/pipelines/runtime.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 770d9c1de4cda8..d2d758637607dd 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -934,7 +934,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: checked + buildConfig: Checked platforms: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: @@ -1011,14 +1011,14 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: release + buildConfig: Release runtimeFlavor: mono platforms: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - liveRuntimeBuildConfig: release + liveRuntimeBuildConfig: Release condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), From f529323582cf7127137af7dc80ed0fd95adf505f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Nov 2021 13:56:14 -0800 Subject: [PATCH 7/9] Use buildConfigUpper for the runtime override path. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 4 ++-- eng/pipelines/runtime.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 31cfbc43bad3ef..a42523fab0b389 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -90,12 +90,12 @@ jobs: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/coreclr/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/coreclr/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, '$(buildConfigUpper)')) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:MonoOverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} + value: ${{ format('/p:MonoOverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, '$(buildConfigUpper)')) }} - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index d2d758637607dd..0cf401a0f1d623 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -934,7 +934,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: Checked + buildConfig: checked platforms: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: @@ -1011,7 +1011,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: Release + buildConfig: release runtimeFlavor: mono platforms: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 From e7a3032046c2c4e9577e170380967bf81b659a6e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Nov 2021 19:54:49 -0800 Subject: [PATCH 8/9] Now that we don't have a CoreLib dependency in the build job, do some serious simplification to make the only dependency the ref assemblies (since everything else is unused) --- eng/liveBuilds.targets | 19 +++++++++--- .../templates/runtimes/build-test-job.yml | 31 +++---------------- eng/pipelines/coreclr/ci.yml | 2 -- eng/pipelines/coreclr/clrinterpreter.yml | 1 - eng/pipelines/coreclr/crossgen2-composite.yml | 1 - eng/pipelines/coreclr/crossgen2-gcstress.yml | 1 - eng/pipelines/coreclr/crossgen2-outerloop.yml | 3 +- eng/pipelines/coreclr/crossgen2.yml | 1 - eng/pipelines/coreclr/gc-longrunning.yml | 1 - eng/pipelines/coreclr/gc-simulator.yml | 1 - eng/pipelines/coreclr/gc-standalone.yml | 1 - eng/pipelines/coreclr/gcstress-extra.yml | 1 - .../coreclr/gcstress0x3-gcstress0xc.yml | 1 - eng/pipelines/coreclr/ilasm.yml | 1 - eng/pipelines/coreclr/jit-experimental.yml | 1 - eng/pipelines/coreclr/jitstress-isas-arm.yml | 1 - eng/pipelines/coreclr/jitstress-isas-x86.yml | 1 - eng/pipelines/coreclr/jitstress.yml | 1 - .../coreclr/jitstress2-jitstressregs.yml | 1 - eng/pipelines/coreclr/jitstressregs-x86.yml | 1 - eng/pipelines/coreclr/jitstressregs.yml | 1 - eng/pipelines/coreclr/pgo.yml | 1 - eng/pipelines/coreclr/r2r-extra.yml | 1 - eng/pipelines/coreclr/r2r.yml | 1 - eng/pipelines/coreclr/release-tests.yml | 1 - eng/pipelines/coreclr/runincontext.yml | 1 - eng/pipelines/coreclr/superpmi-collect.yml | 3 +- eng/pipelines/coreclr/tieringtest.yml | 1 - eng/pipelines/runtime.yml | 3 -- eng/pipelines/runtimelab.yml | 1 - src/tests/Directory.Build.targets | 4 +-- src/tests/build.proj | 3 -- 32 files changed, 24 insertions(+), 68 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index d62f4bcd438d8c..1cd7a1d81a2aae 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -139,13 +139,20 @@ Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesNativeArtifactsPath). Configuration: '$(LibrariesConfiguration)'. To use a different configuration, specify the 'LibrariesConfiguration' property." /> - + + + + + + + + - - - + + $(RuntimeIdGraphDefinitionFile) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index a42523fab0b389..8091389bc098e2 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -5,14 +5,6 @@ parameters: osSubgroup: '' container: '' testGroup: '' - liveRuntimeBuildConfig: '' - - # Determines librariesbuild configuration to use for the tests. Setting this property implies - # a dependency of this job on the appropriate libraries build and is used - # to construct the name of the Azure artifact representing libraries build - # to use for building the tests. - liveLibrariesBuildConfig: '' - displayNameArgs: '' condition: true stagedBuild: false @@ -45,13 +37,8 @@ jobs: runtimeVariant: ${{ parameters.runtimeVariant }} testGroup: ${{ parameters.testGroup }} stagedBuild: ${{ parameters.stagedBuild }} - liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} pool: ${{ parameters.pool }} dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} - ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: - liveRuntimeBuildParams: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - liveRuntimeBuildParams: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'), eq(parameters.archType, 'x64'))), not(eq(parameters.osGroup, 'OSX'))) }}: compilerArg: '-clang9' @@ -86,16 +73,8 @@ jobs: variables: - ${{ each variable in parameters.variables }}: - ${{ variable }} - - ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: - - name: liveRuntimeBuildParams - value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/coreclr/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, '$(buildConfigUpper)')) }} - - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - - name: liveRuntimeBuildParams - value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} - - name: liveRuntimeArtifactsPathArg - value: ${{ format('/p:MonoOverridePath=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, '$(buildConfigUpper)')) }} + - name: liveRuntimeBuildParams + value: 'libs.ref -c Release -ci' - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: @@ -139,7 +118,7 @@ jobs: displayName: Disk Usage before Build # Build managed test components - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) /p:RuntimeOS=${{ parameters.osGroup }}${{ parameters.osSubgroup }} /p:LibrariesTargetOSConfigurationArchitecture=${{ parameters.osGroup }}${{ parameters.osSubgroup }}-${{ parameters.liveLibrariesBuildConfig }}-${{ parameters.archType }} $(liveRuntimeArtifactsPathArg) /p:TargetOS=AnyOS + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci /p:TargetOS=AnyOS displayName: Build managed test components - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: @@ -151,7 +130,7 @@ jobs: # Zip and publish managed test components - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: '$(binTestsPath)/AnyOS.$(archType).$(buildConfigUpper)' + rootFolder: '$(managedTestArtifactRootFolderPath)' includeRootFolder: false archiveExtension: '.tar.gz' archiveType: tar @@ -178,6 +157,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_AnyOS_AnyCPU_$(buildConfig)_Lib${{ parameters.liveLibrariesBuildConfig }}_${{ parameters.testGroup }}' + artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_AnyOS_AnyCPU_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index baa13cfef87a26..fab41af74d73e8 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -111,8 +111,6 @@ jobs: platforms: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 testGroup: outerloop - jobParameters: - liveLibrariesBuildConfig: Release # # Checked JIT test runs diff --git a/eng/pipelines/coreclr/clrinterpreter.yml b/eng/pipelines/coreclr/clrinterpreter.yml index af74c063ba98e3..204d666e7bde3b 100644 --- a/eng/pipelines/coreclr/clrinterpreter.yml +++ b/eng/pipelines/coreclr/clrinterpreter.yml @@ -34,7 +34,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: clrinterpreter - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index df683c547bea9e..feea85ea9d3405 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-gcstress.yml b/eng/pipelines/coreclr/crossgen2-gcstress.yml index 444861b6dfac08..fc00d1d7b9a940 100644 --- a/eng/pipelines/coreclr/crossgen2-gcstress.yml +++ b/eng/pipelines/coreclr/crossgen2-gcstress.yml @@ -33,7 +33,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress-extra - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index df73f8bddea807..b60cc7860fbc2d 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -20,7 +20,7 @@ jobs: - Linux_arm64 - OSX_arm64 - OSX_x64 - - windows_x86 + - windows_x86 - windows_x64 - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 @@ -67,7 +67,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release # Test most platforms in composite mode as the expected mainline shipping mode - template: /eng/pipelines/common/platform-matrix.yml diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index ba38b43211d33d..35edb1df223172 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -33,7 +33,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index c188c756538eff..e685b36da1fdf3 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -32,7 +32,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-longrunning - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index 16c24cb5dae659..bade23db69eeb9 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -33,7 +33,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-simulator - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gc-standalone.yml b/eng/pipelines/coreclr/gc-standalone.yml index ab0c4d0734b0c0..3aa02047610c3e 100644 --- a/eng/pipelines/coreclr/gc-standalone.yml +++ b/eng/pipelines/coreclr/gc-standalone.yml @@ -30,7 +30,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-standalone - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index ab867202f80a79..6700a71d0dc8b1 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -31,7 +31,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress-extra - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index 436deaca79677a..dba8e21d60497f 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -31,7 +31,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress0x3-gcstress0xc - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml index 187719b4377ec4..eff00c788fe5ec 100644 --- a/eng/pipelines/coreclr/ilasm.yml +++ b/eng/pipelines/coreclr/ilasm.yml @@ -44,7 +44,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: ilasm - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index 02048f1bac6734..f6e4edd422bdeb 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -29,7 +29,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jit-experimental - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index c1410678e4a9a7..42cf82b96d94e9 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -30,7 +30,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-arm - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index 90453431d8114f..65798ce5252d09 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -31,7 +31,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-x86 - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index f1f50f97b66abd..4ea3c6c2a23831 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index 0e826e0db010c8..a3eb7c09fc14cd 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: checked - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index 204cf5632f159a..006d4ed57f3f28 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -30,7 +30,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs-x86 - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index c90d4bb8bc998b..727e0e674b76f3 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/pgo.yml b/eng/pipelines/coreclr/pgo.yml index 132464b8dad59f..80f1579e1bf1c4 100644 --- a/eng/pipelines/coreclr/pgo.yml +++ b/eng/pipelines/coreclr/pgo.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: pgo - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 9c386ac556e862..940c29d7f3741a 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -31,7 +31,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: r2r-extra - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index 4fc7662293c50d..81bee51bc93273 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -35,7 +35,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index bfa51bd287826d..fb7cd6ad8adb4e 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -36,7 +36,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release # # Release test runs diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index 9dcd8f7a1bc779..1588a59bcf539f 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -30,7 +30,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/superpmi-collect.yml b/eng/pipelines/coreclr/superpmi-collect.yml index 7b285903a5fef7..0d41f151d6b554 100644 --- a/eng/pipelines/coreclr/superpmi-collect.yml +++ b/eng/pipelines/coreclr/superpmi-collect.yml @@ -12,7 +12,7 @@ trigger: - src/coreclr/inc/jiteeversionguid.h # This pipeline is supposed to be run only on merged changes -# and should not be triggerable from a PR. +# and should not be triggerable from a PR. pr: none schedules: @@ -54,7 +54,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/tieringtest.yml b/eng/pipelines/coreclr/tieringtest.yml index 7767c3261fbd52..0a57b1e27754af 100644 --- a/eng/pipelines/coreclr/tieringtest.yml +++ b/eng/pipelines/coreclr/tieringtest.yml @@ -30,7 +30,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop - liveLibrariesBuildConfig: Release - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index dec3272c956fde..af8b9c116dd80c 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -933,7 +933,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop - liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1011,8 +1010,6 @@ jobs: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop - liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - liveRuntimeBuildConfig: Release condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index db73445d799874..9f1cd90822e832 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -142,7 +142,6 @@ stages: - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop - liveLibrariesBuildConfig: Release dependsOn: - build_Linux_x64_Checked_ - build_Linux_x64_Release_ diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 84bb4bd744ea24..a3aca72d338e58 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -226,7 +226,7 @@ - + false @@ -235,7 +235,7 @@ + DependsOnTargets="ResolveLibrariesRefAssembliesFromLocalBuild"> diff --git a/src/tests/build.proj b/src/tests/build.proj index aff9b1a19371d0..0a7d6f2b16d9e9 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -448,9 +448,6 @@ $(GroupBuildCmd) "/p:TargetArchitecture=$(TargetArchitecture)" $(GroupBuildCmd) "/p:Configuration=$(Configuration)" $(GroupBuildCmd) "/p:LibrariesConfiguration=$(LibrariesConfiguration)" - $(GroupBuildCmd) "/p:LibrariesTargetOSConfigurationArchitecture=$(LibrariesTargetOSConfigurationArchitecture)" - $(GroupBuildCmd) "/p:CoreCLROverridePath=$(CoreCLROverridePath)" - $(GroupBuildCmd) "/p:MonoOverridePath=$(MonoOverridePath)" $(GroupBuildCmd) "/p:TargetOS=$(TargetOS)" $(GroupBuildCmd) "/p:RuntimeOS=$(RuntimeOS)" $(GroupBuildCmd) "/p:RuntimeFlavor=$(RuntimeFlavor)" From d1d2454588a134b20168848a9e3ae0eba7bd317c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Nov 2021 20:13:45 -0800 Subject: [PATCH 9/9] Fix upload path --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 8091389bc098e2..f7cc7202d2a25c 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -130,7 +130,7 @@ jobs: # Zip and publish managed test components - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: '$(managedTestArtifactRootFolderPath)' + rootFolder: '$(binTestsPath)/AnyOS.$(archType).$(buildConfigUpper)' includeRootFolder: false archiveExtension: '.tar.gz' archiveType: tar