fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/container-template.jobs.yaml

@@ -83,7 +83,7 @@ jobs:
         targetOs: ${{ parameters.os }}
         targetArch: ${{ parameters.arch }}
         targetPlatform: "${{ parameters.os }}/${{ parameters.arch }}" 
-        addBuildArgs: 
+        addBuildArgs: $(EXTRA_BUILD_ARGS_${{ image }}_${{ parameters.os }}_${{ parameters.arch }})
         ${{ if eq(variables.Agent.OSArchitecture, 'ARM') }}:
           buildArch: arm64
 

.pipelines/containers/container-template.steps.yaml

@@ -51,13 +51,6 @@ parameters:
 
 
 steps:
-#    path: $(Build.SourcesDirectory)
-#    buildArguments: --platform "${{ parameters.targetPlatform }}" --build-arg ARCH="${{ parameters.buildArch }}" --build-arg OS="${{ parameters.buildOs }}" --build-arg VERSION="$(IMAGE_PLATFORM_TAG_${{ parameters.name }})" --target "${{ parameters.os }}" $(EXTRA_BUILD_ARGS_${{ parameters.name }})
-#    enableNetwork: true
-#    enablePull: false
-#    enableCache: true
-#    useBuildKit: true
-
     - task: 1ES.BuildContainerImage@1
       retryCountOnTaskFailure: 3
       inputs:

.pipelines/trigger.yaml

@@ -32,19 +32,19 @@ resources:
 variables:
   # Local analysis is only enabled on PR branches
   Codeql.AnalyzeInPipeline: $[startsWith(variables['Build.SourceBranch'], 'refs/pull/')]
-  Codeql.ADO.Build.Repository.Uri: $(Build.Repository.Uri)
-  Codeql.ADO.Build.Repository.Name: $(Build.Repository.Name)
-  Codeql.ADO.Build.SourceVersion: $(Build.SourceVersion)
-  Codeql.ADO.Build.DefinitionName: $(Build.DefinitionName)
-  Codeql.ADO.Build.BuildId: $(Build.BuildId)
-  Codeql.ADO.System.CollectionUri: $(System.CollectionUri)
-  Codeql.ADO.System.TeamProject: $(System.TeamProject)
-  Codeql.ADO.System.JobId: $(System.JobId)
-  Codeql.ADO.Build.Repository.LocalPath: $(Build.Repository.LocalPath)
-  Codeql.ADO.Build.SourceBranch: $(Build.SourceBranch)
-  Codeql.ADO.Build.Repository.Provider: $(Build.Repository.Provider)
-  Codeql.ADO.Build.SourceBranchName: $(Build.SourceBranchName)
-  Codeql.ADO.Build.SourcesDirectory: $(Build.SourcesDirectory)
+#  Codeql.ADO.Build.Repository.Uri: $(Build.Repository.Uri)
+#  Codeql.ADO.Build.Repository.Name: $(Build.Repository.Name)
+#  Codeql.ADO.Build.SourceVersion: $(Build.SourceVersion)
+#  Codeql.ADO.Build.DefinitionName: $(Build.DefinitionName)
+#  Codeql.ADO.Build.BuildId: $(Build.BuildId)
+#  Codeql.ADO.System.CollectionUri: $(System.CollectionUri)
+#  Codeql.ADO.System.TeamProject: $(System.TeamProject)
+#  Codeql.ADO.System.JobId: $(System.JobId)
+#  Codeql.ADO.Build.Repository.LocalPath: $(Build.Repository.LocalPath)
+#  Codeql.ADO.Build.SourceBranch: $(Build.SourceBranch)
+#  Codeql.ADO.Build.Repository.Provider: $(Build.Repository.Provider)
+#  Codeql.ADO.Build.SourceBranchName: $(Build.SourceBranchName)
+#  Codeql.ADO.Build.SourcesDirectory: $(Build.SourcesDirectory)
 
 
 extends: