Change test matrix and exclude arm64 from PRs

Commit migrated from dotnet/corefx@292042b
hgdiaz · Jun 13, 2019 · 4bcb825 · 4bcb825
1 parent 9a32eac
commit 4bcb825
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 73 deletions.
diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
@@ -23,65 +23,46 @@ jobs:
       displayName: Linux
       strategy:
         matrix:
-          x64_Release:
-            _BuildConfig: Release
-            _architecture: x64
-            _framework: netcoreapp
-            _helixQueues: $(linuxDefaultQueues)
-            _dockerContainer: rhel7_container
-            _buildScriptPrefix: ''
-            _buildExtraArguments: ''
-            _publishTests: true
-
-          arm64_Release:
-            _BuildConfig: Release
-            _architecture: arm64
-            _framework: netcoreapp
-            _helixQueues: $(linuxArm64Queues)
-            _dockerContainer: ubuntu_1604_arm64_cross_container
-            _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 '
-            _buildExtraArguments: -warnAsError false
-            _publishTests: true
-
-          musl_x64_Release:
-             _BuildConfig: Release
-             _architecture: x64
-             _framework: netcoreapp
-             _helixQueues: $(alpineQueues)
-             _dockerContainer: alpine_36_container
-             _buildScriptPrefix: ''
-             _buildExtraArguments: /p:RuntimeOS=linux-musl
-             _publishTests: true
-
-          ${{ if or(eq(parameters.testScope, 'outerloop'), eq(parameters.testScope, 'all')) }}:
-            x64_Debug:
-              _BuildConfig: Debug
+          ${{ if eq(parameters.fullMatrix, 'false') }}:
+            x64_Release:
+              _BuildConfig: Release
               _architecture: x64
               _framework: netcoreapp
               _helixQueues: $(linuxDefaultQueues)
               _dockerContainer: rhel7_container
               _buildScriptPrefix: ''
               _buildExtraArguments: ''
+              _publishTests: true
 
-            arm64_Debug:
+            musl_x64_Debug:
               _BuildConfig: Debug
-              _architecture: arm64
+              _architecture: x64
               _framework: netcoreapp
-              _helixQueues: $(linuxArm64Queues)
-              _dockerContainer: ubuntu_1604_arm64_cross_container
-              _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 '
-              _buildExtraArguments: --warnAsError false
+              _helixQueues: $(alpineQueues)
+              _dockerContainer: alpine_36_container
+              _buildScriptPrefix: ''
+              _buildExtraArguments: /p:RuntimeOS=linux-musl
 
-            musl_x64_Debug:
+          ${{ if eq(parameters.fullMatrix, 'true') }}:
+            x64_Debug:
               _BuildConfig: Debug
               _architecture: x64
               _framework: netcoreapp
+              _helixQueues: $(linuxDefaultQueues)
+              _dockerContainer: rhel7_container
+              _buildScriptPrefix: ''
+              _buildExtraArguments: ''
+
+            musl_x64_Release:
+              _BuildConfig: Release
+              _architecture: x64
+              _framework: netcoreapp
               _helixQueues: $(alpineQueues)
               _dockerContainer: alpine_36_container
               _buildScriptPrefix: ''
               _buildExtraArguments: /p:RuntimeOS=linux-musl
+              _publishTests: true
 
-          ${{ if eq(parameters.fullMatrix, 'true') }}:
             arm_Release:
               _BuildConfig: Release
               _architecture: arm
@@ -102,6 +83,16 @@ jobs:
               _buildExtraArguments: -warnAsError false /p:BuildNativeCompiler=--clang5.0 /p:RuntimeOS=linux-musl
               _publishTests: true
 
+            arm64_Release:
+              _BuildConfig: Release
+              _architecture: arm64
+              _framework: netcoreapp
+              _helixQueues: $(linuxArm64Queues)
+              _dockerContainer: ubuntu_1604_arm64_cross_container
+              _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 '
+              _buildExtraArguments: -warnAsError false
+              _publishTests: true
+
       pool:
         name: Hosted Ubuntu 1604
 
@@ -132,22 +123,30 @@ jobs:
         displayName: Linux
         strategy:
           matrix:
-            arm_Release:
-              _BuildConfig: Release
+            arm_Debug:
+              _BuildConfig: Debug
               _architecture: arm
               _framework: netcoreapp
               _buildExtraArguments: /p:RuntimeOS=ubuntu.16.04 -warnAsError false
               _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm '
               _dockerContainer: ubuntu_1604_arm_cross_container
 
-            musl_arm64_Release:
-              _BuildConfig: Release
+            musl_arm64_Debug:
+              _BuildConfig: Debug
               _architecture: arm64
               _framework: netcoreapp
               _dockerContainer: alpine_37_arm64_container
               _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 '
               _buildExtraArguments: -warnAsError false /p:BuildNativeCompiler=--clang5.0 /p:RuntimeOS=linux-musl
 
+            arm64_Debug:
+              _BuildConfig: Debug
+              _architecture: arm64
+              _framework: netcoreapp
+              _dockerContainer: ubuntu_1604_arm64_cross_container
+              _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 '
+              _buildExtraArguments: --warnAsError false
+
         pool:
           name: Hosted Ubuntu 1604
 

diff --git a/eng/pipelines/libraries/windows.yml b/eng/pipelines/libraries/windows.yml
@@ -50,15 +50,6 @@ jobs:
               _architecture: x64
               _framework: uap
               _helixQueues: $(uapNetfxQueues)
-
-          # Run arm on the matrix or in Outerloop
-          ${{ if or(eq(parameters.fullMatrix, 'true'), or(eq(parameters.testScope, 'outerloop'), eq(parameters.testScope, 'all'))) }}:
-            arm64_Release:
-              _BuildConfig: Release
-              _architecture: arm64
-              _framework: netcoreapp
-              _helixQueues: $(windowsArmQueue)
-              _publishTests: true
 
           # Full test matrix
           ${{ if eq(parameters.fullMatrix, 'true') }}:
@@ -102,6 +93,13 @@ jobs:
               _framework: uap
               _helixQueues: $(uapNetfxQueues)
 
+            arm64_Release:
+              _BuildConfig: Release
+              _architecture: arm64
+              _framework: netcoreapp
+              _helixQueues: $(windowsArmQueue)
+              _publishTests: true
+
       pool:
         name: Hosted VS2017
 
@@ -126,15 +124,13 @@ jobs:
         displayName: Packaging All Configurations
         strategy:
           matrix:
-            # PR Validation Matrix
             ${{ if eq(parameters.fullMatrix, 'false') }}:
               x64_Debug:
                 _BuildConfig: Debug
                 _architecture: x64
                 _framework: allConfigurations
                 _helixQueues: $(allConfigurationsQueues)
 
-            # Official Build Matrix
             ${{ if eq(parameters.fullMatrix, 'true') }}:
               x64_Release:
                 _BuildConfig: Release
@@ -166,23 +162,23 @@ jobs:
             displayName: Build Packages and Tests
 
       # Legs without HELIX testing
-    - ${{ if eq(parameters.fullMatrix, 'true') }}:
-      - job: WindowsNoTest
-        displayName: Windows
-        strategy:
-          matrix:
-            arm_Release:
-              _BuildConfig: Release
-              _architecture: arm
-              _framework: netcoreapp
+      - ${{ if eq(parameters.fullMatrix, 'true') }}:
+        - job: WindowsNoTest
+          displayName: Windows
+          strategy:
+            matrix:
+              arm_Release:
+                _BuildConfig: Release
+                _architecture: arm
+                _framework: netcoreapp
 
-            UAP_arm_Release:
-              _BuildConfig: Release
-              _architecture: arm
-              _framework: uap
+              UAP_arm_Release:
+                _BuildConfig: Release
+                _architecture: arm
+                _framework: uap
 
-        pool:
-          name: Hosted VS2017
+          pool:
+            name: Hosted VS2017
 
-        submitToHelix: false
-        buildExtraArguments: /p:RuntimeOS=win10
+          submitToHelix: false
+          buildExtraArguments: /p:RuntimeOS=win10