From 5cedcabba16d766cafe49c2dc2856a4943766c42 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Thu, 25 Jul 2024 08:14:08 -0700
Subject: [PATCH] Remove workaround for Mariner ARM container images not
 setting architecture variant metadata (#5726)

---
 eng/pipelines/stages/build-test-publish-repo.yml       |  3 +--
 .../steps/set-imagebuilder-build-args-var.yml          | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 eng/pipelines/steps/set-imagebuilder-build-args-var.yml

diff --git a/eng/pipelines/stages/build-test-publish-repo.yml b/eng/pipelines/stages/build-test-publish-repo.yml
index 6c3e9254e..a5b2055af 100644
--- a/eng/pipelines/stages/build-test-publish-repo.yml
+++ b/eng/pipelines/stages/build-test-publish-repo.yml
@@ -23,10 +23,9 @@ stages:
 
     # Template paths must be relative to the YAML job that executes them
     customBuildInitSteps:
-    - template: /eng/pipelines/steps/set-imagebuilder-build-args-var.yml@self
     - template: /eng/pipelines/steps/set-public-source-branch-var.yml@self
     - powershell: |
-        $imageBuilderBuildArgs = "$(imageBuilderBuildArgs)"
+        $imageBuilderBuildArgs = "$IMAGEBUILDERBUILDARGS"
         if ("$(publishRepoPrefix)".Contains("internal/")) {
           $sasQueryString = "$(dotnetstage-account-sas-read-token)"
           $imageBuilderBuildArgs += " --build-arg SAS_QUERY_STRING='$sasQueryString'"
diff --git a/eng/pipelines/steps/set-imagebuilder-build-args-var.yml b/eng/pipelines/steps/set-imagebuilder-build-args-var.yml
deleted file mode 100644
index b9162399d..000000000
--- a/eng/pipelines/steps/set-imagebuilder-build-args-var.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-steps:
-- powershell: |
-    $imageBuilderBuildArgs = $env:IMAGEBUILDERBUILDARGS
-    # Disable platform checks for CBL-Mariner on ARM64 due to https://github.com/dotnet/dotnet-docker/issues/3520
-    if ("$(osVersions)".Contains("cbl-mariner") -and "$(architecture)" -eq "arm64") {
-      $imageBuilderBuildArgs += " --skip-platform-check"
-    }
-
-    echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$imageBuilderBuildArgs"
-  displayName: Set Custom ImageBuilder Build Args