Skip to content

Add MachO composite Crossgen2 test jobs for OSX #127770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtschuster wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add MachO composite Crossgen2 test jobs for OSX #127770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828e3c6
Add MachO composite Crossgen2 test jobs for OSX and plumb crossgen2Ou…
jtschuster May 4, 2026
ac211aa
Don't use MachO-suffixed artifact name
jtschuster May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ parameters:
crossBuild: false
readyToRun: false
compositeBuildMode: false
crossgen2OutputFormat: ''
helixQueues: ''
displayNameArgs: ''
runInUnloadableContext: false
Expand Down Expand Up @@ -115,6 +116,7 @@ steps:
timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
compositeBuildMode: ${{ parameters.compositeBuildMode }}
crossgen2OutputFormat: ${{ parameters.crossgen2OutputFormat }}
runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
nativeAotTest: ${{ parameters.nativeAotTest }}
helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ parameters:
hotColdSplitting: false
liveLibrariesBuildConfig: ''
compositeBuildMode: false
crossgen2OutputFormat: ''
largeVersionBubble: false
useCodeFlowEnforcement: ''
helixQueues: ''
Expand Down Expand Up @@ -127,6 +128,9 @@ jobs:
value: 'composite'
- name: LogNamePrefix
value: TestRunLogs_R2R_CG2_Composite
- ${{ if ne(parameters.crossgen2OutputFormat, '') }}:
- name: LogNamePrefix
value: TestRunLogs_R2R_CG2_${{ parameters.crossgen2OutputFormat }}
- ${{ if eq(parameters.hotColdSplitting, true) }}:
- name: LogNamePrefix
value: TestRunLogs_R2R_CG2_HotColdSplitting
Expand Down Expand Up @@ -316,6 +320,7 @@ jobs:
timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
compositeBuildMode: ${{ parameters.compositeBuildMode }}
crossgen2OutputFormat: ${{ parameters.crossgen2OutputFormat }}
runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
runInterpreter: ${{ parameters.runInterpreter }}
tieringTest: ${{ parameters.tieringTest }}
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ parameters:
timeoutPerTestInMinutes: ''
runCrossGen2: ''
compositeBuildMode: false
crossgen2OutputFormat: ''
helixProjectArguments: ''
extraHelixArguments: ''
runInUnloadableContext: ''
Expand Down Expand Up @@ -56,6 +57,7 @@ steps:
_HelixType: ${{ parameters.helixType }}
_RunCrossGen2: ${{ parameters.runCrossGen2 }}
_CompositeBuildMode: ${{ parameters.compositeBuildMode }}
_CrossGen2OutputFormat: ${{ parameters.crossgen2OutputFormat }}
_RunInUnloadableContext: ${{ parameters.runInUnloadableContext }}
_RunInterpreter: ${{ parameters.runInterpreter }}
_TieringTest: ${{ parameters.tieringTest }}
Expand Down
17 changes: 17 additions & 0 deletions eng/pipelines/coreclr/crossgen2-composite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,20 @@ extends:
displayNameArgs: Composite_LargeVersionBubble
liveLibrariesBuildConfig: Release
unifiedArtifactsName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
buildConfig: checked
platforms:
- osx_arm64
- osx_x64
jobParameters:
testGroup: innerloop
readyToRun: true
compositeBuildMode: true
crossgen2OutputFormat: macho
displayNameArgs: Composite_MachO
liveLibrariesBuildConfig: Release
unifiedArtifactsName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)
17 changes: 17 additions & 0 deletions eng/pipelines/coreclr/crossgen2-outerloop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,23 @@ extends:
liveLibrariesBuildConfig: Release
unifiedArtifactsName: Checked_CoreCLR_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
buildConfig: checked
platforms:
- osx_arm64
- osx_x64
jobParameters:
testGroup: outerloop
readyToRun: true
compositeBuildMode: true
crossgen2OutputFormat: macho
displayNameArgs: R2R_Composite_MachO
liveLibrariesBuildConfig: Release
unifiedArtifactsName: Checked_CoreCLR_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)

# Outerloop testing in non-composite mode
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
3 changes: 3 additions & 0 deletions src/tests/Common/helixpublishwitharcade.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<_RunCrossGen>false</_RunCrossGen>
<_RunCrossGen2>false</_RunCrossGen2>
<_CompositeBuildMode>false</_CompositeBuildMode>
<_CrossGen2OutputFormat></_CrossGen2OutputFormat>
<_LongRunningGCTests>false</_LongRunningGCTests>
<_GcSimulatorTests>false</_GcSimulatorTests>
<_RunInUnloadableContext>false</_RunInUnloadableContext>
Expand Down Expand Up @@ -102,6 +103,7 @@
PublishTestResults=$(_PublishTestResults);
RunCrossGen2=$(_RunCrossGen2);
CompositeBuildMode=$(_CompositeBuildMode);
CrossGen2OutputFormat=$(_Crossgen2OutputFormat);
LongRunningGCTests=$(_LongRunningGCTests);
GcSimulatorTests=$(_GcSimulatorTests);
RunInUnloadableContext=$(_RunInUnloadableContext);
Expand Down Expand Up @@ -646,6 +648,7 @@
<HelixPreCommand Include="export CORE_ROOT=$HELIX_CORRELATION_PAYLOAD" />
<HelixPreCommand Include="export RunCrossGen2=1" Condition=" '$(RunCrossGen2)' == 'true' " />
<HelixPreCommand Include="export CompositeBuildMode=1" Condition=" '$(CompositeBuildMode)' == 'true' " />
<HelixPreCommand Include="export CrossGen2OutputFormat=$(CrossGen2OutputFormat)" Condition=" '$(CrossGen2OutputFormat)' != '' " />
<HelixPreCommand Include="export RunningLongGCTests=1" Condition=" '$(LongRunningGCTests)' == 'true' " />
Comment on lines 649 to 652
<HelixPreCommand Include="export RunningGCSimulatorTests=1" Condition=" '$(GcSimulatorTests)' == 'true' " />
<HelixPreCommand Include="export RunInUnloadableContext=1" Condition=" '$(RunInUnloadableContext)' == 'true' " />
Expand Down
Loading