Move OSX test-only CI jobs to Linux runners #124930
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| parameters: | ||
| buildConfig: '' | ||
| osGroup: '' | ||
| osSubgroup: '' | ||
| archType: '' | ||
| targetRid: '' | ||
| hostedOs: '' | ||
| timeoutInMinutes: 150 | ||
| pool: '' | ||
| condition: true | ||
| shouldContinueOnError: false | ||
| variables: {} | ||
| dependsOn: [] | ||
| dependsOnGlobalBuilds: [] | ||
| helixQueues: [] | ||
| buildArtifactName: '' | ||
| testArtifactName: '' | ||
| templatePath: 'templates' | ||
|
|
||
| jobs: | ||
| - template: /eng/common/${{ parameters.templatePath }}/job/job.yml | ||
| parameters: | ||
| enablePublishBuildArtifacts: true | ||
| timeoutInMinutes: ${{ parameters.timeoutInMinutes }} | ||
| condition: and(succeeded(), ${{ parameters.condition }}) | ||
| helixRepo: dotnet/runtime | ||
| displayName: ${{ format('Installer Test {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} | ||
| ${{ if eq(parameters.hostedOs, '') }}: | ||
| name: ${{ format('installer_test_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} | ||
| ${{ if ne(parameters.hostedOs, '') }}: | ||
| name: ${{ format('installer_test_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.hostedOs, parameters.buildConfig) }} | ||
|
|
||
| pool: ${{ parameters.pool }} | ||
|
|
||
| ${{ if eq(parameters.osSubGroup, '_musl') }}: | ||
| disableComponentGovernance: true | ||
|
|
||
| dependsOn: | ||
| - ${{ each build in parameters.dependsOn }}: | ||
| - ${{ build }} | ||
| - ${{ each globalBuild in parameters.dependsOnGlobalBuilds }}: | ||
| - ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(globalBuild.buildConfig, parameters.buildConfig), globalBuild.nameSuffix) }} | ||
|
|
||
| workspace: | ||
| clean: all | ||
|
|
||
| variables: | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - group: DotNet-HelixApi-Access | ||
| - group: AzureDevOps-Artifact-Feeds-Pats | ||
|
|
||
| - ${{ parameters.variables }} | ||
|
|
||
| steps: | ||
| - checkout: self | ||
| clean: true | ||
| fetchDepth: $(checkoutFetchDepth) | ||
| fetchTags: false | ||
|
|
||
| - template: /eng/common/${{ parameters.templatePath }}/steps/enable-internal-sources.yml | ||
|
|
||
| - template: /eng/pipelines/common/download-artifact-step.yml | ||
| parameters: | ||
| unpackFolder: $(Build.SourcesDirectory)/artifacts/bin | ||
| artifactFileName: '${{ parameters.buildArtifactName }}$(archiveExtension)' | ||
| artifactName: '${{ parameters.buildArtifactName }}' | ||
| displayName: 'unified artifacts' | ||
|
|
||
| - template: /eng/pipelines/common/download-artifact-step.yml | ||
| parameters: | ||
| unpackFolder: $(Build.SourcesDirectory)/artifacts/tests | ||
| artifactFileName: '${{ parameters.testArtifactName }}$(archiveExtension)' | ||
| artifactName: '${{ parameters.testArtifactName }}' | ||
| displayName: 'installer test artifacts' | ||
|
|
||
| - template: /eng/pipelines/installer/helix.yml | ||
| parameters: | ||
| osGroup: ${{ parameters.osGroup }} | ||
| archType: ${{ parameters.archType }} | ||
| helixQueues: ${{ parameters.helixQueues }} | ||
| creator: dotnet-bot |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -250,7 +250,7 @@ extends: | |||
| - windows_x64 | ||||
| jobParameters: | ||||
| nameSuffix: CoreCLR_Libraries | ||||
| buildArgs: -s clr+libs+libs.tests+host+packs -rc Release -c $(_BuildConfig) -hc Release /p:ArchiveTests=true | ||||
| timeoutInMinutes: 120 | ||||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
|
|
@@ -270,6 +270,15 @@ extends: | |||
| archiveExtension: $(archiveExtension) | ||||
| tarCompression: $(tarCompression) | ||||
| artifactName: CoreCLR_Libraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
| parameters: | ||||
| rootFolder: $(Build.SourcesDirectory)/artifacts/tests | ||||
|
Member
There was a problem hiding this comment. (Not in this PR) At some point we should unify between |
||||
| includeRootFolder: false | ||||
| archiveType: $(archiveType) | ||||
| archiveExtension: $(archiveExtension) | ||||
| tarCompression: $(tarCompression) | ||||
| artifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| displayName: Installer Test Assets | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
|
|
@@ -284,7 +293,7 @@ extends: | |||
| - windows_x86 | ||||
| jobParameters: | ||||
| nameSuffix: CoreCLR_Libraries | ||||
| buildArgs: -s clr+libs+libs.tests+host+packs -c $(_BuildConfig) -hc $(debugOnPrReleaseOnRolling) /p:ArchiveTests=true | ||||
| timeoutInMinutes: 120 | ||||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
|
|
@@ -304,6 +313,15 @@ extends: | |||
| archiveExtension: $(archiveExtension) | ||||
| tarCompression: $(tarCompression) | ||||
| artifactName: CoreCLR_Libraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
| parameters: | ||||
| rootFolder: $(Build.SourcesDirectory)/artifacts/tests | ||||
| includeRootFolder: false | ||||
| archiveType: $(archiveType) | ||||
| archiveExtension: $(archiveExtension) | ||||
| tarCompression: $(tarCompression) | ||||
| artifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| displayName: Installer Test Assets | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
|
|
@@ -322,7 +340,7 @@ extends: | |||
| - osx_x64 | ||||
| jobParameters: | ||||
| nameSuffix: CoreCLR_Libraries | ||||
| buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -hc $(debugOnPrReleaseOnRolling) | ||||
| timeoutInMinutes: 120 | ||||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
|
|
@@ -334,6 +352,15 @@ extends: | |||
| tarCompression: $(tarCompression) | ||||
| artifactName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| displayName: Build Assets | ||||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||||
| parameters: | ||||
| rootFolder: $(Build.SourcesDirectory)/artifacts/tests | ||||
| includeRootFolder: false | ||||
| archiveType: $(archiveType) | ||||
| archiveExtension: $(archiveExtension) | ||||
| tarCompression: $(tarCompression) | ||||
| artifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| displayName: Installer Test Assets | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
|
|
@@ -1449,69 +1476,83 @@ extends: | |||
| eq(variables['isRollingBuild'], true)) | ||||
|
|
||||
| # | ||||
| # Installer Test | ||||
| # | ||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
| jobTemplate: /eng/pipelines/installer/run-test-job.yml | ||||
| buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} | ||||
| platforms: | ||||
| - windows_x86 | ||||
| helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml | ||||
| jobParameters: | ||||
| dependsOnGlobalBuilds: | ||||
| - nameSuffix: CoreCLR_Libraries | ||||
| buildConfig: release | ||||
| buildArtifactName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Release | ||||
| testArtifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Release | ||||
| timeoutInMinutes: 150 | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
| eq(variables['isRollingBuild'], true)) | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
| jobTemplate: /eng/pipelines/installer/run-test-job.yml | ||||
| buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} | ||||
| platforms: | ||||
| - osx_x64 | ||||
| helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml | ||||
| jobParameters: | ||||
| hostedOs: linux | ||||
|
Comment on lines
1505
to
+1508
There was a problem hiding this comment. Setting There was a problem hiding this comment. The
Suggested change
|
||||
| dependsOnGlobalBuilds: | ||||
| - nameSuffix: CoreCLR_Libraries | ||||
| buildConfig: release | ||||
| buildArtifactName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Release | ||||
| testArtifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Release | ||||
| timeoutInMinutes: 150 | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
| eq(variables['isRollingBuild'], true)) | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
| jobTemplate: /eng/pipelines/installer/run-test-job.yml | ||||
| buildConfig: release | ||||
| platforms: | ||||
| - windows_x64 | ||||
| - linux_x64 | ||||
| helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml | ||||
| jobParameters: | ||||
| dependsOnGlobalBuilds: | ||||
| - nameSuffix: CoreCLR_Libraries | ||||
| buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} | ||||
| buildArtifactName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) | ||||
| testArtifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) | ||||
| timeoutInMinutes: 150 | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
| eq(variables['isRollingBuild'], true)) | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
| jobTemplate: /eng/pipelines/installer/run-test-job.yml | ||||
| buildConfig: release | ||||
| platforms: | ||||
| - osx_arm64 | ||||
| helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml | ||||
| jobParameters: | ||||
| hostedOs: linux | ||||
|
There was a problem hiding this comment.
Suggested change
|
||||
| dependsOnGlobalBuilds: | ||||
| - nameSuffix: CoreCLR_Libraries | ||||
| buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} | ||||
| buildArtifactName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) | ||||
| testArtifactName: Installer_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) | ||||
| timeoutInMinutes: 150 | ||||
| condition: >- | ||||
| or( | ||||
| eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true), | ||||
| eq(variables['isRollingBuild'], true)) | ||||
|
|
@@ -1880,6 +1921,7 @@ extends: | |||
| jobParameters: | ||||
| testScope: innerloop | ||||
| liveRuntimeBuildConfig: checked | ||||
| hostedOs: linux | ||||
|
There was a problem hiding this comment.
Suggested change
|
||||
| unifiedArtifactsName: Libraries_CheckedCoreCLR_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| helixArtifactsName: Libraries_CheckedCoreCLR_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) | ||||
| unifiedBuildNameSuffix: Libraries_CheckedCoreCLR | ||||
|
|
||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now that we're building all subsets in these jobs, we should rename these jobs to
AllSubsets_CoreCLRto be consistent with the other jobs where we build all subsets.