Fix leg configurations in official builds

Commit migrated from https://github.com/dotnet/corefx/commit/32c7d6dad79ec54cd23e5f4bbdf2ce3e827fa1bd

diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
index ac17239..d6a2b4b 100644 (file)
--- a/eng/pipelines/libraries/linux.yml
+++ b/eng/pipelines/libraries/linux.yml
@@ -24,18 +24,18 @@ jobs:
       strategy:
         matrix:
           ${{ if eq(parameters.fullMatrix, 'false') }}:
-            x64_Release:
-              _BuildConfig: Release
+            x64_Debug:
+              _BuildConfig: Debug
               _architecture: x64
               _framework: netcoreapp
               _helixQueues: $(linuxDefaultQueues)
               _dockerContainer: rhel7_container
               _buildScriptPrefix: ''
               _buildExtraArguments: ''
-              _publishTests: true
 
-            musl_x64_Debug:
-              _BuildConfig: Debug
+            # Use a Release leg in PRs to validate both configurations
+            musl_x64_Release:
+              _BuildConfig: Release
               _architecture: x64
               _framework: netcoreapp
               _helixQueues: $(alpineQueues)
@@ -44,14 +44,15 @@ jobs:
               _buildExtraArguments: /p:RuntimeOS=linux-musl
 
           ${{ if eq(parameters.fullMatrix, 'true') }}:
-            x64_Debug:
-              _BuildConfig: Debug
+            x64_Release:
+              _BuildConfig: Release
               _architecture: x64
               _framework: netcoreapp
               _helixQueues: $(linuxDefaultQueues)
               _dockerContainer: rhel7_container
               _buildScriptPrefix: ''
               _buildExtraArguments: ''
+              _publishTests: true
 
             musl_x64_Release:
               _BuildConfig: Release
@@ -104,7 +105,6 @@ jobs:
       timeoutInMinutes: 180
 
       variables:
-        - linuxArm64Queues: \(Ubuntu.1604.Arm64.Open\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539
 
         - ${{ 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
@@ -115,10 +115,11 @@ jobs:
           - linuxArmQueues: \(Debian.9.Arm32.Open\)Ubuntu.1604.Arm32.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-b049512-20190321153542
           - alpineQueues: \(Alpine.38.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246+\(Alpine.39.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
           - alpineArm64Queues: \(Alpine.38.Arm64.Open\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724
+          - linuxArm64Queues: \(Ubuntu.1604.Arm64.Open\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539
 
     # Legs without helix testing
     # Only run this leg in PRs.
-    - ${{ if and(eq(parameters.isOfficialBuild, 'false'), and(ne(parameters.testScope, 'outerloop'), ne(parameters.testScope, 'all'))) }}:
+    - ${{ if and(eq(parameters.fullMatrix, 'false'), and(ne(parameters.testScope, 'outerloop'), ne(parameters.testScope, 'all'))) }}:
       - job: LinuxNoTest
         displayName: Linux
         strategy: