Update common Docker engineering infrastructure with latest

dotnet · Jan 9, 2025 · 68102cf · 68102cf
1 parent f0d4a41
commit 68102cf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/eng/common/templates/jobs/build-images.yml b/eng/common/templates/jobs/build-images.yml
@@ -13,10 +13,9 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
-  condition: and(${{ parameters.matrix }}, not(canceled()), or(in(dependencies.PreBuildValidation.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'), eq(${{ parameters.isInternalServicingValidation }}, 'true')))
+  condition: and(${{ parameters.matrix }}, not(canceled()), in(dependencies.PreBuildValidation.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'))
   dependsOn:
-  - ${{ if eq(parameters.isInternalServicingValidation, 'false') }}:
-    - PreBuildValidation
+  - PreBuildValidation
   - CopyBaseImages
   - GenerateBuildMatrix
   pool: ${{ parameters.pool }}

diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml
@@ -51,25 +51,24 @@ stages:
 - stage: Build
   condition: and(succeeded(), contains(variables['stages'], 'build'))
   jobs:
-  - ${{ if eq(parameters.isInternalServicingValidation, 'false') }}:
-    - template: /eng/common/templates/jobs/test-images-linux-client.yml@self
-      parameters:
-        name: PreBuildValidation
-        pool: ${{ parameters.linuxAmd64Pool }}
-        testJobTimeout: ${{ parameters.linuxAmdTestJobTimeout }}
-        preBuildValidation: true
-        internalProjectName: ${{ parameters.internalProjectName }}
-        customInitSteps:
-          - ${{ parameters.customTestInitSteps }}
-          # These variables are normally set by the matrix. Since this test job is not generated
-          # by a matrix, we need to set them manually. They can be set to empty values since their
-          # values aren't actually used for the pre-build tests.
-          - powershell: |
-              echo "##vso[task.setvariable variable=productVersion]"
-              echo "##vso[task.setvariable variable=imageBuilderPaths]"
-              echo "##vso[task.setvariable variable=osVersions]"
-              echo "##vso[task.setvariable variable=architecture]"
-            displayName: Initialize Test Variables
+  - template: /eng/common/templates/jobs/test-images-linux-client.yml@self
+    parameters:
+      name: PreBuildValidation
+      pool: ${{ parameters.linuxAmd64Pool }}
+      testJobTimeout: ${{ parameters.linuxAmdTestJobTimeout }}
+      preBuildValidation: true
+      internalProjectName: ${{ parameters.internalProjectName }}
+      customInitSteps:
+        - ${{ parameters.customTestInitSteps }}
+        # These variables are normally set by the matrix. Since this test job is not generated
+        # by a matrix, we need to set them manually. They can be set to empty values since their
+        # values aren't actually used for the pre-build tests.
+        - powershell: |
+            echo "##vso[task.setvariable variable=productVersion]"
+            echo "##vso[task.setvariable variable=imageBuilderPaths]"
+            echo "##vso[task.setvariable variable=osVersions]"
+            echo "##vso[task.setvariable variable=architecture]"
+          displayName: Initialize Test Variables
   - template: /eng/common/templates/jobs/copy-base-images-staging.yml@self
     parameters:
       name: CopyBaseImages

diff --git a/eng/common/templates/steps/init-docker-windows.yml b/eng/common/templates/steps/init-docker-windows.yml
@@ -51,7 +51,7 @@ steps:
         $authedImageBuilderCmds = @(
           '$env:AZURE_TENANT_ID = $env:tenantId'
           '$env:AZURE_CLIENT_ID = $env:servicePrincipalId'
-          '$env:AZURE_FEDERATED_TOKEN_FILE' + " = $tokenHostFilePath"
+          '$env:AZURE_FEDERATED_TOKEN_FILE = ' + "'" + "$tokenHostFilePath" + "'"
           $runImageBuilderCmd
         )
 

diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
@@ -1,6 +1,6 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2584978
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2613921
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
-  imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner
+  imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner
   imageNames.testRunner.withrepo: testrunner-withrepo:$(Build.BuildId)-$(System.JobId)