[release/3.1] Enable additional CI testing (#28149)

* Enable more CI testing in eng/platform-matrix.yml * Allow gcstress test scenarios with the new queue in eng/platform-matrix.yml * Enable the new queue in R2R pipeline in eng/pipelines/r2r.yml * Enable the new queue in eng/pipelines/corefx*.yml * Replace 'eq' with 'in' in eng/platform-matrix.yml
dotnet · Mar 12, 2021 · 0897c45 · 0897c45
1 parent 1d4fd4a
commit 0897c45
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/eng/pipelines/corefx-jitstress.yml b/eng/pipelines/corefx-jitstress.yml
@@ -16,26 +16,26 @@ jobs:
     jobTemplate: build-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
 
 - template: /eng/platform-matrix.yml
   parameters:
     jobTemplate: test-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
     helixQueueGroup: corefx
     jobParameters:
       testGroup: jitstress

diff --git a/eng/pipelines/corefx-jitstress2-jitstressregs.yml b/eng/pipelines/corefx-jitstress2-jitstressregs.yml
@@ -16,26 +16,26 @@ jobs:
     jobTemplate: build-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
 
 - template: /eng/platform-matrix.yml
   parameters:
     jobTemplate: test-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
     helixQueueGroup: corefx
     jobParameters:
       testGroup: jitstress2-jitstressregs

diff --git a/eng/pipelines/corefx-jitstressregs.yml b/eng/pipelines/corefx-jitstressregs.yml
@@ -16,26 +16,26 @@ jobs:
     jobTemplate: build-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
 
 - template: /eng/platform-matrix.yml
   parameters:
     jobTemplate: test-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
     helixQueueGroup: corefx
     jobParameters:
       testGroup: jitstressregs

diff --git a/eng/pipelines/corefx.yml b/eng/pipelines/corefx.yml
@@ -16,26 +16,26 @@ jobs:
     jobTemplate: build-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
 
 - template: /eng/platform-matrix.yml
   parameters:
     jobTemplate: test-job.yml
     buildConfig: checked
     platforms:
-    # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
     - Linux_arm
     - Linux_arm64
     - Linux_x64
     # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
     helixQueueGroup: corefx
     jobParameters:
       testGroup: outerloop

diff --git a/eng/pipelines/r2r.yml b/eng/pipelines/r2r.yml
@@ -13,6 +13,7 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
 
 - template: /eng/platform-matrix.yml
   parameters:
@@ -24,6 +25,7 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
+    - Windows_NT_arm64
     helixQueueGroup: ci
     jobParameters:
       testGroup: outerloop

diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml
@@ -273,7 +273,7 @@ jobs:
 
 # Windows arm64
 
-- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), eq(parameters.platformGroup, 'all')) }}:
+- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
   - template: ${{ parameters.jobTemplate }}
     parameters:
       ignoreDependencyOnBuildJobs: ${{ parameters.ignoreDependencyOnBuildJobs }}
@@ -282,7 +282,8 @@ jobs:
       osGroup: Windows_NT
       osIdentifier: Windows_NT
       helixQueues:
-      # TODO: Consider adding Windows.10.Arm64.Open here if capacity is enough for handling both Windows_NT/arm and Windows_NT/arm64 testing
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.helixQueueGroup, 'pr', 'ci', 'corefx')) }}:
+        - Windows.10.Arm64v8.Open
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - Windows.10.Arm64
       ${{ insert }}: ${{ parameters.jobParameters }}