Separate Build Changes

Author: Sheyla Trudo

.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml

@@ -8,11 +8,11 @@ parameters:
 
 jobs:
   - job: CNI_${{ parameters.os }}
-    condition: and( not(canceled()), not(failed()) )
     displayName: CNI k8s E2E ${{ parameters.os }}
     dependsOn: ${{ parameters.dependsOn }}
     pool:
       name: $(BUILD_POOL_NAME_DEFAULT)
+      os: linux
     steps:
       - task: AzureCLI@2
         inputs:

.pipelines/containers/manifest-template.yaml

@@ -36,7 +36,22 @@ steps:
     displayName: Manifest Push
     retryCountOnTaskFailure: 3
 
-  - task: 1ES.PublishPipelineArtifact@1
+  - task: AzureCLI@2
+    displayName: "Logout"
+    inputs:
+      azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      inlineScript: |
+        docker logout
+
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: "Add SBOM Generator tool"
+    inputs:
+      BuildDropPath: "$(Build.ArtifactStagingDirectory)"
+
+  - task: PublishBuildArtifacts@1
     inputs:
       artifactName: "output"
-      targetPath: "$(Build.ArtifactStagingDirectory)"
+      pathtoPublish: "$(Build.ArtifactStagingDirectory)"
+    condition: succeeded()

.pipelines/multitenancy/swiftv2-e2e.jobs.yaml

@@ -17,9 +17,8 @@ stages:
       - setup
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
-      ACN_DIR: $(Build.SourcesDirectory)
     jobs:
-      - template: ../templates/create-cluster-swiftv2.jobs.yaml@ACNTools
+      - template: ../templates/create-cluster-swiftv2.yaml
         parameters:
           name: ${{ parameters.name }}
           displayName: ${{ parameters.displayName }}
@@ -39,7 +38,6 @@ stages:
     - publish
     - ${{ parameters.clusterName }}
     variables:
-      ACN_DIR: $(Build.SourcesDirectory)
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
       GOBIN: "$(GOPATH)/bin" # Go binaries path
       modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
@@ -48,22 +46,14 @@ stages:
       - job: ${{ parameters.name }}
         displayName: Swiftv2 Multitenancy E2E Test Suite - (${{ parameters.name }})
         pool:
-          isCustom: true
-          type: linux
           name: $(BUILD_POOL_NAME_DEFAULT)
+          os: linux
           demands:
           - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
-        variables:
-          ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
-          ob_git_checkout: true
         steps:
-          - checkout: ACNReviewChanges
-            clean: true
-
-          - template: swiftv2-e2e.steps.yaml@ACNTools
+          - template: swiftv2-e2e.steps.yaml
             parameters:
               name: ${{ parameters.name }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: linux
-

.pipelines/multitenancy/swiftv2-e2e.steps.yaml

@@ -4,31 +4,25 @@ parameters:
   continueOnError: true
 
 steps:
-  - bash: |
-      go version
-      go env
-      mkdir -p '$(GOBIN)'
-      mkdir -p '$(GOPATH)/pkg'
-      mkdir -p '$(modulePath)'
-      echo '##vso[task.prependpath]$(GOBIN)'
-      echo '##vso[task.prependpath]$(GOROOT)/bin'
-    name: "GoEnv"
-    displayName: "Set up the Go environment"
-
   - task: KubectlInstaller@0
     inputs:
       kubectlVersion: latest
 
   - task: AzureCLI@2
+    displayName: "Start Swiftv2 Pods"
+    continueOnError: ${{ parameters.continueOnError }}
+    env:
+      AZCLI: az
+      CLUSTER: ${{ parameters.clusterName }}
+      SUBNET_TOKEN: $(SUBNET_TOKEN)
     inputs:
       azureSubscription: $(ACN_TEST_SERVICE_CONNECTION)
       scriptLocation: "inlineScript"
       scriptType: "bash"
-      workingDirectory: $(ACN_DIR)
       addSpnToEnvironment: true
       inlineScript: |
         set -e
-        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf
         ls -lah
         pwd
         kubectl cluster-info
@@ -58,21 +52,13 @@ steps:
         echo "Check pods after 4 minutes"
         kubectl get po -owide -A
         kubectl describe pni
-    name: "start_swiftv2_pods"
-    displayName: "Start Swiftv2 Pods"
-    continueOnError: ${{ parameters.continueOnError }}
-    env:
-      SUBNET_TOKEN: $(SUBNET_TOKEN)
 
   - script: |
       set -e
       kubectl get po -owide -A
       cd test/integration/swiftv2
       echo "TestSwiftv2PodToPod and will run it after migration from scripts."
       go test -count=1 swiftv2_test.go -timeout 3m -tags swiftv2 -run ^TestSwiftv2PodToPod$ -tags=swiftv2,integration -v
-    workingDirectory: $(ACN_DIR)
     retryCountOnTaskFailure: 3
-    name: "Swiftv2_Tests_future_version"
     displayName: "Swiftv2 Tests through code"
     continueOnError: ${{ parameters.continueOnError }}
-

.pipelines/pipeline.yaml

@@ -1,3 +1,24 @@
+pr:
+  branches:
+    include:
+      - master
+      - release/*
+  paths:
+    exclude:
+      - ".devcontainer"
+      - ".hooks"
+      - ".vscode"
+      - ".github"
+      - docs
+
+trigger:
+  branches:
+    include:
+      - gh-readonly-queue/master/*
+  tags:
+    include:
+      - "*"
+
 stages:
   - stage: setup
     displayName: ACN
@@ -6,7 +27,6 @@ stages:
         displayName: Setup
         pool:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
-          os: linux
         steps:
           - script: |
               # To use the variables below, you must make the respective stage's dependsOn have - setup or it will not retain context of this stage
@@ -45,12 +65,7 @@ stages:
             STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           steps:
-            - task: GoTool@0
-              inputs:
-                version: $(GO_VERSION)
-
             - script: |
                 make ipv6-hp-bpf-lib
                 make all-binaries-platforms
@@ -73,10 +88,11 @@ stages:
                 targetFolder: $(Build.ArtifactStagingDirectory)
               condition: succeeded()
 
-            - task: 1ES.PublishPipelineArtifact@1
+            - task: PublishBuildArtifacts@1
               inputs:
                 artifactName: "output"
-                targetPath: "$(Build.ArtifactStagingDirectory)"
+                pathtoPublish: "$(Build.ArtifactStagingDirectory)"
+              condition: succeeded()
 
     - stage: containerize
       displayName: Build Images
@@ -88,7 +104,6 @@ stages:
           displayName: Build Images
           pool:
             name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
-            os: linux
           strategy:
             matrix:
               azure_ipam_linux_amd64:
@@ -128,9 +143,6 @@ stages:
                 name: npm
                 os: windows
           steps:
-            - task: GoTool@0
-              inputs:
-                version: $(GO_VERSION)
             - template: containers/container-template.yaml
               parameters:
                 arch: $(arch)
@@ -141,7 +153,6 @@ stages:
           displayName: Build Images
           pool:
             name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
-            os: linux
           strategy:
             matrix:
               azure_ipam_linux_arm64:
@@ -182,7 +193,6 @@ stages:
           displayName: Compile Manifests
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             matrix:
               azure_ipam:
@@ -201,9 +211,6 @@ stages:
                 name: npm
                 platforms: linux/amd64 linux/arm64 windows/amd64
           steps:
-            - task: GoTool@0
-              inputs:
-                version: $(GO_VERSION)
             - template: containers/manifest-template.yaml
               parameters:
                 name: $(name)
@@ -391,7 +398,6 @@ stages:
           displayName: Delete Cluster
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             matrix:
               cilium_e2e:
@@ -443,7 +449,7 @@ stages:
                 clusterName: "cildsovere2e"
                 region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST)
           steps:
-            - template: templates/delete-cluster.yaml
+            - template: templates/delete-cluster.steps.yaml
               parameters:
                 name: $(name)
                 clusterName: $(clusterName)-$(commitID)
@@ -455,7 +461,6 @@ stages:
           displayName: Delete Cluster
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             matrix:
               swiftv2_e2e:
@@ -467,7 +472,7 @@ stages:
                 clusterName: "swiftv2dummy"
                 region: $(REGION_SWIFTV2_CLUSTER_TEST)
           steps:
-            - template: templates/delete-cluster.yaml
+            - template: templates/delete-cluster.steps.yaml
               parameters:
                 name: $(name)
                 clusterName: $(clusterName)-$(commitID)