[release/6.0] Use simpler Docker tags (#29575)

- also align helix.proj (default) Helix queues w/ CI choices
dotnet · Nov 30, 2022 · 376a235 · 376a235
1 parent 98d0b23
commit 376a235
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -263,12 +263,12 @@ stages:
                   value: $(_BuildConfig)
                 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
                   - name: HelixTargetQueues
-                    value: Windows.10.Amd64.Open;Ubuntu.2204.Amd64.Open;OSX.1100.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220118141424-3069967
+                    value: Windows.10.Amd64.Open;Ubuntu.2204.Amd64.Open;OSX.1100.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
                   - name: _HelixAccessToken
                     value: '' # Needed for public queues
                 - ${{ if ne(variables['System.TeamProject'], 'public') }}:
                   - name: HelixTargetQueues
-                    value: Windows.10.Amd64;Ubuntu.2204.Amd64;OSX.1100.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220118141424-3069967
+                    value: Windows.10.Amd64;Ubuntu.2204.Amd64;OSX.1100.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
                   - name: _HelixAccessToken
                     value: $(HelixApiAccessToken) # Needed for internal queues
               steps:

diff --git a/eng/helix.proj b/eng/helix.proj
@@ -17,7 +17,7 @@
 
   <PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
     <!-- Local build outside of Azure Pipeline -->
-    <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1014.Amd64.Open;Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20201109180804-3069967</HelixTargetQueues>
+    <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.2004.Amd64.Open;OSX.1014.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64</HelixTargetQueues>
     <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
     <HelixSource>efcore/localbuild/</HelixSource>
     <HelixBuild>t001</HelixBuild>