From 9a6883f53837be3f3f3b979eea7b71bbd6c8ff64 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 7 Feb 2023 21:39:29 -0800
Subject: [PATCH] Update Debian11 Arm64 queue to Debian12 (#46419)

* Update Debian11 Arm queue to Debian12

* Don't use staging queue

* Unskip template tests on deb12 arm
---
 eng/targets/Helix.Common.props                                | 4 ++--
 src/ProjectTemplates/README.md                                | 2 +-
 .../Templates.Blazor.Server.Tests.csproj                      | 3 ---
 .../Templates.Blazor.WebAssembly.Auth.Tests.csproj            | 3 ---
 .../Templates.Blazor.WebAssembly.Tests.csproj                 | 3 ---
 .../test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj       | 3 ---
 .../test/Templates.Tests/Templates.Tests.csproj               | 3 ---
 7 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index b2aa47f9fdca..921b38f23564 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -5,7 +5,7 @@
     <HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
     <HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
     <HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
-    <HelixQueueArmDebian11>(Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
+    <HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
 
     <!-- Do not attempt to override global property. -->
     <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
@@ -44,7 +44,7 @@
         <HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
         <HelixAvailableTargetQueue Include="$(HelixQueueFedora34)" Platform="Linux" />
         <HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian11)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
 
         <!-- Mac -->
         <HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
diff --git a/src/ProjectTemplates/README.md b/src/ProjectTemplates/README.md
index d85fd89d6d26..3c85ddee0417 100644
--- a/src/ProjectTemplates/README.md
+++ b/src/ProjectTemplates/README.md
@@ -87,7 +87,7 @@ An entire test project can be configured to skip specific platforms using the `<
 
 ```xml
 <SkipHelixQueues>
-    $(HelixQueueArmDebian11);
+    $(HelixQueueArmDebian12);
 </SkipHelixQueues>
 ```
 
diff --git a/src/ProjectTemplates/test/Templates.Blazor.Server.Tests/Templates.Blazor.Server.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.Server.Tests/Templates.Blazor.Server.Tests.csproj
index fdc0147f7974..2b6cbfc3e91c 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.Server.Tests/Templates.Blazor.Server.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.Server.Tests/Templates.Blazor.Server.Tests.csproj
@@ -19,9 +19,6 @@
     <RestoreFolderName>Server</RestoreFolderName>
     <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <HelixTimeout>01:00:00</HelixTimeout>
-    <SkipHelixQueues>
-      $(HelixQueueArmDebian11);
-    </SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
index e48d3ba92ee0..3754aee3abd4 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
@@ -19,9 +19,6 @@
     <RestoreFolderName>WebAssembly</RestoreFolderName>
     <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <HelixTimeout>01:00:00</HelixTimeout>
-    <SkipHelixQueues>
-      $(HelixQueueArmDebian11);
-    </SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
index 32a1dfb484a5..44348f90847a 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
@@ -18,9 +18,6 @@
     <TestTemplateCreationFolder>TestTemplates\</TestTemplateCreationFolder>
     <RestoreFolderName>WebAssembly</RestoreFolderName>
     <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
-    <SkipHelixQueues>
-      $(HelixQueueArmDebian11);
-    </SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
index 5c28f27c75ee..ea789d94e04d 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
@@ -19,9 +19,6 @@
     <RestoreFolderName>Mvc</RestoreFolderName>
     <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <HelixTimeout>01:00:00</HelixTimeout>
-    <SkipHelixQueues>
-      $(HelixQueueArmDebian11);
-    </SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
index 57794559fe5f..cf8508cb1559 100644
--- a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
@@ -19,9 +19,6 @@
     <RestoreFolderName>Other</RestoreFolderName>
     <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
     <HelixTimeout>01:00:00</HelixTimeout>
-    <SkipHelixQueues>
-      $(HelixQueueArmDebian11);
-    </SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup>