diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index 23bb12d4af4d8f..493dcf1a3cdd8d 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -1,13 +1,5 @@ trigger: none -schedules: -- cron: "0 6 * * *" - displayName: Mon through Sun at 10:00 PM (UTC-8:00) - branches: - include: - - main - always: true - variables: - template: /eng/pipelines/common/variables.yml - template: /eng/pipelines/helix-platforms.yml diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index eabaa7f34d5add..9dd5e7ec191c44 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -66,10 +66,12 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: + - linux_arm - linux_x64 - linux_arm64 - osx_arm64 - osx_x64 + - windows_x86 - windows_x64 - windows_arm64 jobParameters: @@ -80,6 +82,24 @@ extends: liveLibrariesBuildConfig: Release unifiedArtifactsName: Checked_CoreCLR_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) + # Composite mode with large version bubble (inputbubble) + - 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: + - linux_x64 + - windows_x64 + jobParameters: + testGroup: outerloop + readyToRun: true + compositeBuildMode: true + largeVersionBubble: true + displayNameArgs: R2R_Composite_LargeVersionBubble + liveLibrariesBuildConfig: Release + unifiedArtifactsName: Checked_CoreCLR_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) + # Outerloop testing in non-composite mode - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml deleted file mode 100644 index 8ed90b3ddfec1e..00000000000000 --- a/eng/pipelines/coreclr/r2r.yml +++ /dev/null @@ -1,80 +0,0 @@ -trigger: none - -schedules: -- cron: "0 5 * * *" - displayName: Mon through Sun at 9:00 PM (UTC-8:00) - branches: - include: - - main - always: true - -variables: - - template: /eng/pipelines/common/variables.yml - - template: /eng/pipelines/helix-platforms.yml - -extends: - template: /eng/pipelines/common/templates/pipeline-with-resources.yml - parameters: - stages: - - stage: Build - jobs: - - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked - platforms: - - linux_arm - - linux_arm64 - - linux_x64 - - osx_arm64 - - windows_arm64 - - windows_x64 - - windows_x86 - jobParameters: - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release - postBuildSteps: - - template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/artifacts/bin - includeRootFolder: false - archiveType: $(archiveType) - archiveExtension: $(archiveExtension) - tarCompression: $(tarCompression) - artifactName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) - displayName: Build Assets - extraVariablesTemplates: - - template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml - parameters: - testGroup: outerloop - - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: checked - platforms: - - CoreClrTestBuildHost # Either osx_x64 or linux_x64 - jobParameters: - testGroup: outerloop - - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml - buildConfig: checked - platforms: - - linux_arm - - linux_arm64 - - linux_x64 - - osx_arm64 - - windows_arm64 - - windows_x64 - - windows_x86 - helixQueueGroup: ci - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: outerloop - readyToRun: true - displayNameArgs: R2R - liveLibrariesBuildConfig: Release - unifiedArtifactsName: BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig)