fixup! Separate Build Changes

Author: Sheyla Trudo

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

@@ -8,28 +8,36 @@ parameters:
 - name: images
   type: object
 
-- name: pushAcr
-  type: string
+- name: containerRegistry
+  type: object
 
 
 jobs:
 - ${{ each image in parameters.images }}:
   - job: ${{ replace(image, '-', '_') }}_${{ parameters.os }}_${{ parameters.arch }}
     displayName: Build Image - (${{ image }} ${{ parameters.os }}/${{ parameters.arch }})
+    templateContext:
+      authenticatedContainerRegistries:
+      - registry: ${{ parameters.containerRegistry.name }}
+        identity: ManagedIdentity
+      - registry: onebranch.azurecr.io
+        tenant: AME
+        identity: 1ESPipelineIdentity
 
     steps:
     - task: GoTool@0
       inputs:
         version: $(GO_VERSION)
-
+    
     - task: AzureCLI@2
+      displayName: "Docker Login"
       inputs:
         azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
         scriptLocation: "inlineScript"
         scriptType: "bash"
         addSpnToEnvironment: true
         inlineScript: |
-          az acr login --name "$ACR"
+          ls -la /bin
       env:
         ACR: ${{ parameters.pushAcr }}
 

.pipelines/run-pipeline.yaml

@@ -85,7 +85,9 @@ stages:
         - cns
         - ipv6-hp-bpf
         - npm
-        pushAcr: acnpublic
+        containerRegistry: 
+          name: $(ACR_NAME)
+          #clientId: $(ACR_CLIENTID)
     - template: containers/container-template.jobs.yaml
       parameters:
         arch: arm64
@@ -96,7 +98,9 @@ stages:
         - cns
         - ipv6-hp-bpf
         - npm
-        pushAcr: acnpublic
+        containerRegistry: 
+          name: $(ACR_NAME)
+          #clientId: $(ACR_CLIENTID)
     - template: containers/container-template.jobs.yaml
       parameters:
         arch: amd64
@@ -106,7 +110,9 @@ stages:
         - cni
         - cns
         - npm
-        pushAcr: acnpublic
+        containerRegistry: 
+          name: $(ACR_NAME)
+          #clientId: $(ACR_CLIENTID)
 
 
   - stage: publish

.pipelines/templates/run-unit-tests.stages.yaml

@@ -1,62 +1,62 @@
 stages:
-  - stage: test
-    displayName: Test ACN
-    dependsOn:
-      - setup
-    jobs:
-      - job: test
-        displayName: Run Tests
-        variables:
-          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-        pool:
-          name: "$(BUILD_POOL_NAME_DEFAULT)"
-          os: linux
-          image: acn-runner-vmss-image-1es-v3.0
-        steps:
-          - task: GoTool@0
-            inputs:
-              version: $(GO_VERSION)
+- stage: test
+  displayName: Test ACN
+  dependsOn:
+    - setup
+  jobs:
+  - job: test
+    displayName: Run Tests
+    variables:
+      STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+    pool:
+      name: "$(BUILD_POOL_NAME_DEFAULT)"
+      os: linux
+      image: acn-runner-vmss-image-1es-v3.0
+    steps:
+      - task: GoTool@0
+        inputs:
+          version: $(GO_VERSION)
 
-          - script: |
-              make tools
-              # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
-              { { { {
-                    sudo -E env "PATH=$PATH" make test-all;
-                    echo $? >&3;
-                    } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
-                  } 3>&1;
-                } | { read xs; exit $xs; }
-              } 4>&1
-            retryCountOnTaskFailure: 3
-            name: "Test"
-            displayName: "Run Tests"
+      - script: |
+          make tools
+          # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
+          { { { {
+                sudo -E env "PATH=$PATH" make test-all;
+                echo $? >&3;
+                } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
+              } 3>&1;
+            } | { read xs; exit $xs; }
+          } 4>&1
+        retryCountOnTaskFailure: 3
+        name: "Test"
+        displayName: "Run Tests"
 
-  - stage: test_windows
-    displayName: Test ACN Windows
-    dependsOn:
-      - setup
-    jobs:
-      - job: test
-        displayName: Run Tests
-        variables:
-          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-        pool:
-          name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS)"
-          os: windows
-          image: acn-runner-vmss-image-windows-1es-v2.0
-        steps:
-          - task: GoTool@0
-            inputs:
-              version: $(GO_VERSION)
+- stage: test_windows
+  displayName: Test ACN Windows
+  dependsOn:
+    - setup
+  jobs:
+  - job: test
+    displayName: Run Tests
+    variables:
+      STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+    pool:
+      name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS)"
+      os: windows
+      image: acn-runner-vmss-image-windows-1es-v2.0
+    steps:
+      - task: GoTool@0
+        inputs:
+          version: $(GO_VERSION)
 
-          - script: |
-              cd npm/
-              go test ./...
-              cd ../cni/
-              go test ./...
-              cd ../platform/
-              go test ./...
-            retryCountOnTaskFailure: 3
-            name: "TestWindows"
-            displayName: "Run Windows Tests"
+      - script: |
+          cd npm/
+          go test ./...
+          cd ../cni/
+          go test ./...
+          cd ../platform/
+          go test ./...
+        retryCountOnTaskFailure: 3
+        name: "TestWindows"
+        displayName: "Run Windows Tests"