diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 2409abc20f2..d2ff3a11632 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -19,6 +19,7 @@ parameters: stagedBuild: false variables: {} pool: '' + runtimeFlavor: 'coreclr' runtimeFlavorDisplayName: 'CoreCLR' ### Build managed test components (native components are getting built as part diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index ba72a9aabab..4ae1622ff0b 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -21,6 +21,7 @@ parameters: runInUnloadableContext: false variables: {} pool: '' + runtimeFlavor: 'coreclr' runtimeFlavorDisplayName: 'CoreCLR' ### Test run job diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index b72925a6c32..28a8b59d457 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -11,9 +11,9 @@ parameters: jobs: - template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }} parameters: - ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: + ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}: runtimeFlavorDisplayName: 'CoreCLR' - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}: runtimeFlavorDisplayName: 'Mono' variables: # Disable component governance in our CI builds. These builds are not shipping nor diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index d8877fad159..e8c31b7e3ec 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -672,7 +672,6 @@ jobs: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} liveRuntimeBuildConfig: release - runtimeFlavorDisplayName: 'Mono' condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), @@ -694,7 +693,6 @@ jobs: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} liveRuntimeBuildConfig: release - runtimeFlavorDisplayName: 'Mono' condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),