Add Win11 helix-matrix/quarantine queue, remove win7/8 (dotnet#36040)

* Add Win11 helix-matrix/quarantine queue, remove win7/8 * Add 6.0 config * Fix Win
AJ-72 · Sep 9, 2021 · 313f8db · 313f8db
1 parent 8576c4b
commit 313f8db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
@@ -12,6 +12,7 @@ schedules:
   branches:
     include:
     - release/5.0
+    - release/6.0
   always: false
 
 variables:

diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -10,6 +10,7 @@ trigger:
     include:
     - main
     - release/5.0
+    - release/6.0
 
 # Run PR validation on branches that include Helix tests
 pr:

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
@@ -43,9 +43,7 @@
   <!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, Windows cases-->
   <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
     <HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
-    <!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->
-    <!-- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" /> -->
-    <HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
+    <HelixAvailableTargetQueue Include="Windows.11.Amd64.ClientPre.Open" Platform="Windows" />
   </ItemGroup>
 
   <!-- x64 Queues for internal helix-matrix.yml and quarantine pipelines -->