diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 21e0b2a1c20..7efeab730e0 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -18,8 +18,6 @@ parameters: # for the given platform and helixQueueGroup. helixQueuesTemplate: '' stagedBuild: false - # When set to false, suppresses reuse of OSX managed build artifacts (for pipelines without an OSX obj) - managedOsxBuild: true # When set to true, passes the 'platforms' value as a job parameter also named 'platforms'. # Handled as an opt-in parameter to avoid excessive yaml. passPlatforms: false @@ -47,7 +45,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm' ${{ insert }}: ${{ parameters.jobParameters }} @@ -71,7 +68,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' ${{ insert }}: ${{ parameters.jobParameters }} @@ -100,11 +96,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - ${{ if ne(parameters.managedOsxBuild, true) }}: - managedTestBuildOsGroup: Linux - managedTestBuildOsSubgroup: _musl - ${{ if eq(parameters.managedOsxBuild, true) }}: - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # Linux musl arm64 @@ -128,7 +119,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Linux crossrootfsDir: '/crossrootfs/arm64' ${{ insert }}: ${{ parameters.jobParameters }} @@ -152,10 +142,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - ${{ if ne(parameters.managedOsxBuild, true) }}: - managedTestBuildOsGroup: Linux - ${{ if eq(parameters.managedOsxBuild, true) }}: - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # WebAssembly @@ -305,7 +291,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # tvOS arm64 @@ -325,7 +310,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # iOS x64 @@ -345,7 +329,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # iOS arm @@ -365,7 +348,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # iOS arm64 @@ -385,7 +367,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # macOS x64 @@ -405,7 +386,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # Windows x64 @@ -425,7 +405,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} # Windows x86 @@ -445,7 +424,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} # Windows arm @@ -464,7 +442,6 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} # Windows arm64 @@ -484,5 +461,4 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: Windows_NT ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 1c006271f7e..0b3382acbf7 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -39,8 +39,6 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} - managedTestBuildOsGroup: ${{ parameters.osGroup }} - managedTestBuildOsSubgroup: ${{ parameters.osSubgroup }} container: ${{ parameters.container }} testGroup: ${{ parameters.testGroup }} stagedBuild: ${{ parameters.stagedBuild }} diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index d52240be644..30c71037b52 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -3,8 +3,6 @@ parameters: archType: '' osGroup: '' osSubgroup: '' - managedTestBuildOsGroup: '' - managedTestBuildOsSubgroup: '' container: '' testGroup: '' crossrootfsDir: '' @@ -40,8 +38,6 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} - managedTestBuildOsGroup: ${{ parameters.managedTestBuildOsGroup }} - managedTestBuildOsSubgroup: ${{ parameters.managedTestBuildOsSubgroup }} container: ${{ parameters.container }} testGroup: ${{ parameters.testGroup }} crossrootfsDir: ${{ parameters.crossrootfsDir }} @@ -59,9 +55,9 @@ jobs: dependsOn: - ${{ if ne(parameters.corefxTests, true) }}: - ${{ if eq(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if eq(parameters.testBuildPhased, true) }}: # Also depend on AnyOS AnyCPU tests - ${{ if eq(parameters.testGroup, 'innerloop') }}: @@ -215,7 +211,7 @@ jobs: unpackFolder: '$(managedTestArtifactRootFolderPath)' artifactFileName: '$(managedTestArtifactName)$(archiveExtension)' artifactName: '$(managedTestArtifactName)' - displayName: 'managed test artifacts (built on ${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }})' + displayName: 'managed test artifacts (built on ${{ parameters.osGroup }}${{ parameters.osSubgroup }})' # Download product binaries directory diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index e706868dc49..9036ab9c7d9 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -52,7 +52,6 @@ jobs: - Windows_NT_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: gc-longrunning liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index aa995145cd9..850f918db99 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -21,7 +21,6 @@ jobs: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platformGroup: gcstress - managedOsxBuild: false jobParameters: testGroup: gcstress-extra @@ -32,7 +31,6 @@ jobs: platformGroup: gcstress helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: gcstress-extra liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index ac301435b09..31bedbe454e 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -31,7 +31,6 @@ jobs: platformGroup: gcstress helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: gcstress0x3-gcstress0xc liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index e49b0ce4ca5..7e40f0ea881 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -35,7 +35,6 @@ jobs: - Windows_NT_x64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: jit-experimental liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index a859cd47d65..ca6c7be15e0 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -35,7 +35,6 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 - managedOsxBuild: false helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index dc26e649620..fa02cbc2c0f 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -31,7 +31,6 @@ jobs: platformGroup: gcstress # r2r-extra testGroup runs gcstress15 scenario helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: r2r-extra readyToRun: true diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index 04ef6d73c06..de7d29442cc 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -41,7 +41,6 @@ jobs: - Windows_NT_x86 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - managedOsxBuild: false jobParameters: testGroup: outerloop readyToRun: true diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index c7fd2541f61..24862930cf0 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -35,7 +35,6 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 - managedOsxBuild: false helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/templates/test-job.yml b/eng/pipelines/coreclr/templates/test-job.yml index 9c0cf47dd7f..8eb049d8e92 100644 --- a/eng/pipelines/coreclr/templates/test-job.yml +++ b/eng/pipelines/coreclr/templates/test-job.yml @@ -3,8 +3,6 @@ parameters: archType: '' osGroup: '' osSubgroup: '' - managedTestBuildOsGroup: '' - managedTestBuildOsSubgroup: '' container: '' testGroup: '' readyToRun: false @@ -26,14 +24,14 @@ parameters: ### buildConfig and archType. jobs: -- ${{ if and(ne(parameters.corefxTests, true), eq(parameters.osSubgroup, parameters.managedTestBuildOsSubgroup), eq(parameters.osGroup, parameters.managedTestBuildOsGroup)) }}: +- ${{ if ne(parameters.corefxTests, true) }}: - template: /eng/pipelines/common/templates/runtimes/build-test-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} archType: ${{ parameters.archType }} - osGroup: ${{ parameters.managedTestBuildOsGroup }} - osSubgroup: ${{ parameters.managedTestBuildOsSubgroup }} + osGroup: ${{ parameters.osGroup }} + osSubgroup: ${{ parameters.osSubgroup }} container: ${{ parameters.container }} testGroup: ${{ parameters.testGroup }} displayNameArgs: ${{ parameters.displayNameArgs }} @@ -49,8 +47,6 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} - managedTestBuildOsGroup: ${{ parameters.managedTestBuildOsGroup }} - managedTestBuildOsSubgroup: ${{ parameters.managedTestBuildOsSubgroup }} container: ${{ parameters.container }} testGroup: ${{ parameters.testGroup }} crossrootfsDir: ${{ parameters.crossrootfsDir }} diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 3034285857d..d1141bebf7d 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -3,8 +3,6 @@ parameters: archType: '' osGroup: '' osSubgroup: '' - managedTestBuildOsGroup: '' - managedTestBuildOsSubgroup: '' name: '' helixType: '(unspecified)' container: '' @@ -54,11 +52,11 @@ jobs: variables: - ${{ if ne(parameters.testGroup, '') }}: - name: testArtifactRootName - value: ${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.testGroup }} + value: ${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.testGroup }} - ${{ if eq(parameters.testGroup, '') }}: - name: testArtifactRootName - value: ${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }} + value: ${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }} - name: coreClrRepoRoot value: '$(Build.SourcesDirectory)/src/coreclr' @@ -90,7 +88,7 @@ jobs: value: 'CoreCLRManagedTestArtifacts_AnyOS_AnyCPU_$(buildConfig)' - name: managedTestArtifactName - value: 'CoreCLRManagedTestArtifacts_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + value: 'CoreCLRManagedTestArtifacts_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_$(archType)_$(buildConfig)' - name: managedTestArtifactRootFolderPath value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' @@ -105,7 +103,7 @@ jobs: value: '$(Build.SourcesDirectory)/.packages/microsoft.net.sdk.il' - name: microsoftNetSdkIlArtifactName - value: 'MicrosoftNetSdkIlPackage_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + value: 'MicrosoftNetSdkIlPackage_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_$(archType)_$(buildConfig)' - name: priorityArg value: '' diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml index 052b0f59fcd..18ac9203aef 100644 --- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml @@ -70,13 +70,13 @@ jobs: value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' - name: managedTestArtifactName - value: 'CoreCLRManagedTestArtifacts_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + value: 'CoreCLRManagedTestArtifacts_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_$(archType)_$(buildConfig)' - name: microsoftNetSdkIlFolderPath value: '$(Build.SourcesDirectory)/.packages/microsoft.net.sdk.il' - name: microsoftNetSdkIlArtifactName - value: 'MicrosoftNetSdkIlPackage_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + value: 'MicrosoftNetSdkIlPackage_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_$(archType)_$(buildConfig)' - name: monoRepoRoot value: '$(Build.SourcesDirectory)/src/mono'