From e957834aa13c3c2f3301cce2436e0781f1c7a949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Rylek?= <trylek@microsoft.com>
Date: Fri, 24 Apr 2020 18:41:18 +0200
Subject: [PATCH] Revert "Add runtimeFlavor parameter to build-test-job.yml
 (#35377)"

This reverts commit 59593640865d1c5869bfc72a27f623318411cb14.
---
 eng/pipelines/common/templates/runtimes/build-test-job.yml | 1 -
 eng/pipelines/common/templates/runtimes/run-test-job.yml   | 1 -
 eng/pipelines/common/xplat-setup.yml                       | 4 ++--
 eng/pipelines/runtime.yml                                  | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index d2ff3a1163245e..2409abc20f2ca9 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -19,7 +19,6 @@ 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 4ae1622ff0b9aa..ba72a9aababf0c 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -21,7 +21,6 @@ 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 28a8b59d4579a4..b72925a6c32d91 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.jobParameters.runtimeFlavor, 'coreclr') }}:
+    ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}:
       runtimeFlavorDisplayName: 'CoreCLR'
-    ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
+    ${{ if eq(parameters.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 e8c31b7e3ec276..d8877fad159c63 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -672,6 +672,7 @@ jobs:
       testGroup: innerloop
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
       liveRuntimeBuildConfig: release
+      runtimeFlavorDisplayName: 'Mono'
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
@@ -693,6 +694,7 @@ jobs:
       testGroup: innerloop
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
       liveRuntimeBuildConfig: release
+      runtimeFlavorDisplayName: 'Mono'
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),