From 65ec30e8a634372ddf1f19ece0486513da87dbd9 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 17 Jun 2019 10:44:59 +0200
Subject: [PATCH] Move redhat6 into linux group

Commit migrated from https://github.com/dotnet/corefx/commit/519eccdf8e9c8cb0390f91da8561fcf98a19b838
---
 eng/pipelines/libraries/.azure-ci.yml |  7 ------
 eng/pipelines/libraries/linux.yml     | 16 +++++++++++---
 eng/pipelines/libraries/redhat6.yml   | 40 -----------------------------------
 3 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 eng/pipelines/libraries/redhat6.yml

diff --git a/eng/pipelines/libraries/.azure-ci.yml b/eng/pipelines/libraries/.azure-ci.yml
index 2e16a09..db0acde 100644
--- a/eng/pipelines/libraries/.azure-ci.yml
+++ b/eng/pipelines/libraries/.azure-ci.yml
@@ -62,12 +62,6 @@ jobs:
       isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
       fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
 
-  # RedHat6 leg
-  - template: /eng/pipelines/redhat6.yml
-    parameters:
-      isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
-      fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
-
     # FreeBSD leg is only for official builds
     # - template: /eng/pipelines/freebsd.yml
     #   parameters:
@@ -84,5 +78,4 @@ jobs:
           - AllConfigurations
           - LinuxTest
           - MacOS
-          - RedHat6
           # - FreeBSD
diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
index d6a2b4b..f1a45f1 100644
--- a/eng/pipelines/libraries/linux.yml
+++ b/eng/pipelines/libraries/linux.yml
@@ -23,6 +23,16 @@ jobs:
       displayName: Linux
       strategy:
         matrix:
+          # Run RedHat6 in release mode on CI to cover Release configuration differences
+          RedHat6_x64_Release:
+            _BuildConfig: Release
+            _architecture: x64
+            _framework: netcoreapp
+            _buildExtraArguments: /p:RuntimeOS=rhel.6 /p:PortableBuild=false
+            _dockerContainer: rhel6_container
+            _helixQueues: $(redhatHelixQueue)
+            _publishTests: ${{ parameters.fullMatrix }}
+
           ${{ if eq(parameters.fullMatrix, 'false') }}:
             x64_Debug:
               _BuildConfig: Debug
@@ -33,9 +43,8 @@ jobs:
               _buildScriptPrefix: ''
               _buildExtraArguments: ''
 
-            # Use a Release leg in PRs to validate both configurations
-            musl_x64_Release:
-              _BuildConfig: Release
+            musl_x64_Debug:
+              _BuildConfig: Debug
               _architecture: x64
               _framework: netcoreapp
               _helixQueues: $(alpineQueues)
@@ -105,6 +114,7 @@ jobs:
       timeoutInMinutes: 180
 
       variables:
+        - redhatHelixQueue: RedHat.6.Amd64.Open
 
         - ${{ if eq(parameters.fullMatrix, 'false') }}:
           - linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.9.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+SLES.15.Amd64.Open+\(Fedora.29.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249
diff --git a/eng/pipelines/libraries/redhat6.yml b/eng/pipelines/libraries/redhat6.yml
deleted file mode 100644
index af7f717..0000000
--- a/eng/pipelines/libraries/redhat6.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# RedHat 6 leg
-parameters:
-  # Required: value to specify if the job is comming from an official build to run extra steps and sign binaries
-  #   Default: false
-  isOfficialBuild: false
-  # Required: value to specify if the full test matrix should be tested
-  #   Default: false
-  fullMatrix: false
-  # Optional: value to scope the tests.
-  #   Default: empty
-  testScope: ''
-
-jobs:
-- template: corefx-base.yml
-  parameters:
-    isOfficialBuild: ${{ parameters.isOfficialBuild }}
-    testScope: ${{ parameters.testScope }}
-    targetOS: Linux
-    jobs:
-
-    - job: RedHat6
-      strategy:
-        matrix:
-          x64_Release:
-            _BuildConfig: Release
-            _architecture: x64
-            _framework: netcoreapp
-            _buildExtraArguments: /p:RuntimeOS=rhel.6 /p:PortableBuild=false
-            _dockerContainer: rhel6_container
-            _helixQueues: $(redhatHelixQueue)
-
-      pool:
-        name: Hosted Ubuntu 1604
-
-      container: $[ variables['_dockerContainer'] ]
-      buildExtraArguments: $(_buildExtraArguments)
-      submitToHelix: true
-
-      variables:
-        - redhatHelixQueue: RedHat.6.Amd64.Open
-- 
2.7.4