From 223f44fcb8d2809a0acbc8eacb0304bd34412639 Mon Sep 17 00:00:00 2001
From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:28:26 -0800
Subject: [PATCH] [nightly] Update common Docker engineering infrastructure
 with latest (#6138)

---
 eng/common/templates/jobs/build-images.yml    |  5 +--
 .../stages/build-test-publish-repo.yml        | 37 +++++++++----------
 .../templates/variables/docker-images.yml     |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/eng/common/templates/jobs/build-images.yml b/eng/common/templates/jobs/build-images.yml
index 46c469334b..a1063904d7 100644
--- 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
index 059bdbed0a..aa29b2ba1d 100644
--- 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/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
index 4e7f45d33a..74f2788327 100644
--- a/eng/common/templates/variables/docker-images.yml
+++ b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2600650
+  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:azurelinux3.0-docker-testrunner