[main] Update common Docker engineering infrastructure with latest (#993

)
dotnet · Mar 29, 2024 · 53b7a0e · 53b7a0e
1 parent 71cd7c5
commit 53b7a0e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/eng/common/templates/jobs/publish.yml b/eng/common/templates/jobs/publish.yml
@@ -100,7 +100,7 @@ jobs:
       publicProjectName: ${{ parameters.publicProjectName }}
   - template: /eng/common/templates/steps/wait-for-mcr-image-ingestion.yml@self
     parameters:
-      imageInfoPath: '$(artifactsPath)/image-info.json'
+      imageInfoPath: '$(imageinfoContainerDir)/image-info.json'
       minQueueTime: $(imageQueueTime)
       dryRunArg: $(dryRunArg)
       condition: succeeded()

diff --git a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml b/eng/common/templates/stages/dotnet/build-test-publish-repo.yml
@@ -100,19 +100,15 @@ stages:
         image: Server2016-NESDockerBuilds-PT
 
     # Windows Server 2019 (1809)
-    ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
-      windows1809Pool: Docker-1809-${{ variables['System.TeamProject'] }}
-    ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
-      windows1809Pool:
-        name: NetCore1ESPool-Internal
-        image: 1es-windows-2019
-        os: windows
+    windows1809Pool:
+      os: windows
+      name: Docker-1809-${{ variables['System.TeamProject'] }}
+      ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
+        image: Server2019-1809-NESDockerBuilds-1ESPT
 
     # Windows Server 2022
-    ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
-      windows2022Pool: Docker-2022-${{ variables['System.TeamProject'] }}
-    ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
-      windows2022Pool:
-        name: NetCore1ESPool-Internal
-        image: 1es-windows-2022
-        os: windows
+    windows2022Pool:
+      os: windows
+      name: Docker-2022-${{ variables['System.TeamProject'] }}
+      ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
+        image: Server2022-NESDockerBuilds-1ESPT