From 08038a82051d26063f9d83c0ad1a4cdaab8c2709 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Fri, 8 Mar 2024 13:58:01 -0800
Subject: [PATCH] Internal-only condition cleanup for some variables. Fixed
 another Windows agent to PT agent. Fixed Ubuntu agent to PT Ubuntu agent.

---
 .vsts-ci.yml  | 20 +++++++-------------
 eng/build.yml |  3 ++-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 1d2ac43cf..30edd08f0 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -27,19 +27,16 @@ variables:
   - name: _PublishUsingPipelines
     value: true
 - name: _InternalRuntimeDownloadArgs
-  value: ''
+  value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+    /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
+    /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
 # Only used for tracking purposes in MicroBuild tasks.
 # See: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/650/MicroBuild-Signing?anchor=high-level-steps-to-enable-signing
 - name: TeamName
   value: DotNetCLI
 
 # Variable Groups
-- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-  - group: DotNetBuilds storage account read tokens
-  - name: _InternalRuntimeDownloadArgs
-    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
-      /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-      /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
+- group: DotNetBuilds storage account read tokens
 
 # Variable Templates
 - template: /eng/common/templates-official/variables/pool-providers.yml
@@ -67,12 +64,9 @@ extends:
       # Build Retry Configuration
       - job: Publish_Build_Configuration
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals windows.vs2022preview.amd64.open
-          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-            name: $(DncEngInternalBuildPool)
-            demands: ImageOverride -equals windows.vs2022preview.amd64
+          name: $(DncEngInternalBuildPool)
+          image: 1es-windows-2022-pt
+          os: windows
         steps:
         - task: 1ES.PublishPipelineArtifact@1
           displayName: Publish Build Config
diff --git a/eng/build.yml b/eng/build.yml
index 8b9886458..4abc6006b 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -87,7 +87,8 @@ jobs:
     ${{ if eq(parameters.agentOs, 'Linux') }}:
       pool:
         name: $(DncEngInternalBuildPool)
-        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+        image: 1es-ubuntu-2204-pt
+        os: linux
       container: ${{ parameters.container }}
     ${{ if eq(parameters.agentOs, 'Darwin') }}:
       pool: