fixup! Separate Build Changes

Author: Sheyla Trudo

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

@@ -29,11 +29,6 @@ jobs:
 
     - bash: |
         set -e
-        
-        ip address
-        /usr/bin/dockerd -D &
-        systemctl status docker.socket
-        #systemctl restart docker
 
         BUILD_CONTEXT=$(make "$MAKE_BUILD_CONTEXT")
         echo >&2 "##vso[task.setvariable variable=BUILD_CONTEXT_${VAR_ID};]$BUILD_CONTEXT"
@@ -60,6 +55,7 @@ jobs:
 
     - template: container-template.steps.yaml
       parameters:
-        arch: ${{ parameters.arch }}
         name: ${{ image }}
         os: ${{ parameters.os }}
+        arch: ${{ parameters.arch }}
+        platform: ${{ parameters.os }}/${{ parameters.arch }}

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

@@ -22,6 +22,10 @@ parameters:
   - windows
   - linux
 
+- name: platform
+  type: string
+  default: ""
+
 
 steps:
 - task: 1ES.BuildContainerImage@1
@@ -30,7 +34,7 @@ steps:
     image: $(IMAGE_NAME_AND_TAG_${{ parameters.name }})
     dockerfile: $(DOCKERFILE_PATH_${{ parameters.name }})
     path: $(Build.SourcesDirectory)
-    buildArguments: --platform "${{ parameters.os }}/${{ parameters.arch }}" --build-arg ARCH="${{ parameters.arch }}" --build-arg OS="${{ parameters.os }}" --build-arg PLATFORM="${{ parameters.os }}/${{ parameters.arch }}" --build-arg VERSION="$(IMAGE_PLATFORM_TAG_${{ parameters.name }})" --target "${{ parameters.os }}" $(EXTRA_BUILD_ARGS_${{ parameters.name }})
+    buildArguments: --platform "${{ parameters.platform }}" --build-arg ARCH="${{ parameters.arch }}" --build-arg OS="${{ parameters.os }}" --build-arg PLATFORM="${{ parameters.platform }}" --build-arg VERSION="$(IMAGE_PLATFORM_TAG_${{ parameters.name }})" --target "${{ parameters.os }}" $(EXTRA_BUILD_ARGS_${{ parameters.name }})
     enableNetwork: true
     enablePull: false
     enableCache: true

.pipelines/run-pipeline.yaml

@@ -84,7 +84,7 @@ stages:
       - cns
       - ipv6-hp-bpf
       - npm
-      containerRegistry: 
+      containerRegistry:
         name: $(ACR_NAME)
         clientId: $(ACR_CLIENTID)
   - template: containers/container-template.jobs.yaml
@@ -97,7 +97,7 @@ stages:
       - cns
       - ipv6-hp-bpf
       - npm
-      containerRegistry: 
+      containerRegistry:
         name: $(ACR_NAME)
         clientId: $(ACR_CLIENTID)
   - template: containers/container-template.jobs.yaml
@@ -109,7 +109,7 @@ stages:
       - cni
       - cns
       - npm
-      containerRegistry: 
+      containerRegistry:
         name: $(ACR_NAME)
         clientId: $(ACR_CLIENTID)
 
@@ -292,21 +292,6 @@ stages:
     vmSize: Standard_B2ms
     dependsOn: "containerize"
 
-# Swiftv2 E2E tests with multitenancy cluster start up
-- template: multitenancy/swiftv2-e2e.jobs.yaml
-  parameters:
-    name: "swiftv2_e2e"
-    displayName: Swiftv2 Multitenancy
-    os: linux
-    clusterType: swiftv2-multitenancy-cluster-up
-    clusterName: "mtacluster"
-    nodePoolName: "mtapool"
-    vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
-    dependsOn: "containerize"
-    dummyClusterName: "swiftv2dummy"
-    dummyClusterType: "swiftv2-dummy-cluster-up"
-    dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
-
 - stage: delete
   displayName: Delete Clusters
   condition: always()
@@ -324,7 +309,6 @@ stages:
     - aks_windows_22_e2e
     - dualstackoverlay_e2e
     - cilium_dualstackoverlay_e2e
-    - swiftv2_e2e
   variables:
     commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
   jobs:
@@ -336,7 +320,7 @@ stages:
         cilium_e2e:
           name: cilium_e2e
           clusterName: "ciliume2e"
-          region: $(REGION_AKS_CLUSTER_TEST)                
+          region: $(REGION_AKS_CLUSTER_TEST)
         cilium_nodesubnet_e2e:
           name: cilium_nodesubnet_e2e
           clusterName: "cilndsubnete2e"
@@ -389,25 +373,3 @@ stages:
         region: $(region)
         sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
         svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-
-  - job: delete_test
-    displayName: Delete Cluster
-    strategy:
-      maxParallel: 4
-      matrix:
-        swiftv2_e2e:
-          name: swiftv2_e2e
-          clusterName: "mtacluster"
-          region: $(REGION_SWIFTV2_CLUSTER_TEST)
-        swiftv2_dummy_e2e:
-          name: swiftv2_dummy_e2e
-          clusterName: "swiftv2dummy"
-          region: $(REGION_SWIFTV2_CLUSTER_TEST)
-    steps:
-    - template: templates/delete-cluster.steps.yaml
-      parameters:
-        name: $(name)
-        clusterName: $(clusterName)-$(commitID)
-        region: $(region)
-        sub: $(SUB_AZURE_NETWORK_AGENT_TEST)
-        svcConn: $(ACN_TEST_SERVICE_CONNECTION)

.pipelines/trigger.yaml

@@ -30,11 +30,6 @@ resources:
 
 
 variables:
-  REPO_REF: $[ resources.repositories['azure-container-networking'].ref ]
-  REPO_COMMIT: $[ resources.repositories['azure-container-networking'].version ]
-  REPO_NAME: $[ resources.repositories['azure-container-networking'].name ]
-  REPO_TYPE: $[ resources.repositories['azure-container-networking'].type ]
-  CHANGESET_COMMIT: $[ resources.repositories['self'].version ]
   # Local analysis is only enabled on PR branches
   Codeql.AnalyzeInPipeline: $[startsWith(variables['Build.SourceBranch'], 'refs/pull/')]
 
@@ -48,11 +43,11 @@ extends:
     featureFlags:
       automaticContainerPatching: true
     sdl:
-      sourceAnalysisPool: 
+      sourceAnalysisPool:
         name: $(BUILD_POOL_NAME_DEFAULT_WINDOWS)
         os: windows
         image: acn-runner-vmss-image-windows-1es-v2.0
-      globalSdl: # https://aka.ms/obpipelines/sdl
+      globalSdl:
         #baseline:
           #baselineFile: $(Build.SourcesDirectory)\.config\.gdnbaselines
           #suppressionSet: default