Template

Author: Sheyla Trudo

.pipelines/containers/manifest-template.yaml

@@ -37,22 +37,7 @@ steps:
     displayName: Manifest Push
     retryCountOnTaskFailure: 3
 
-  - 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
+  - task: 1ES.PublishPipelineArtifact@1
     inputs:
       artifactName: "output"
-      pathtoPublish: "$(Build.ArtifactStagingDirectory)"
-    condition: succeeded()
+      targetPath: "$(Build.ArtifactStagingDirectory)"

.pipelines/pipeline.yaml

@@ -1,26 +1,7 @@
-pr:
-  branches:
-    include:
-      - master
-      - release/*
-  paths:
-    exclude:
-      - ".devcontainer"
-      - ".hooks"
-      - ".vscode"
-      - ".github"
-      - docs
-
-trigger:
-  branches:
-    include:
-      - gh-readonly-queue/master/*
-  tags:
-    include:
-      - "*"
-
 stages:
   - stage: setup
+    variables:
+      ACN_DIR: $(Build.SourcesDirectory)
     displayName: ACN
     jobs:
       - job: env
@@ -48,7 +29,6 @@ stages:
               echo $(Build.SourceBranch)
             name: "EnvironmentalVariables"
             displayName: "Set environmental variables"
-            condition: always()
 
   - template: templates/run-unit-tests.yaml
 
@@ -58,6 +38,8 @@ stages:
       dependsOn:
         - setup
         - test
+      variables:
+        ACN_DIR: $(Build.SourcesDirectory)
       jobs:
         - job: build
           displayName: Build Binaries
@@ -66,45 +48,27 @@ stages:
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           steps:
+            - checkout: self
             - script: |
                 make ipv6-hp-bpf-lib
                 make all-binaries-platforms
               name: "BuildAllPlatformBinaries"
               displayName: "Build all platform binaries"
 
-            - script: |
-                mkdir -p ./output/bins
-                cd ./output
-                find . -name '*.tgz' -print -exec mv -t ./bins/ {} +
-                find . -name '*.zip' -print -exec mv -t ./bins/ {} +
-                shopt -s extglob
-                rm -rf !("bins")
-              name: "PrepareArtifacts"
-              displayName: "Prepare Artifacts"
-
-            - task: CopyFiles@2
-              inputs:
-                sourceFolder: "output"
-                targetFolder: $(Build.ArtifactStagingDirectory)
-              condition: succeeded()
-
-            - task: PublishBuildArtifacts@1
-              inputs:
-                artifactName: "output"
-                pathtoPublish: "$(Build.ArtifactStagingDirectory)"
-              condition: succeeded()
-
     - stage: containerize
       displayName: Build Images
       dependsOn:
         - setup
         - test
+      variables:
+        ACN_DIR: $(Build.SourcesDirectory)
       jobs:
         - job: containerize_amd64
           displayName: Build Images
           pool:
             name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
           strategy:
+            maxParallel: 4
             matrix:
               azure_ipam_linux_amd64:
                 arch: amd64
@@ -172,6 +136,7 @@ stages:
                 os: windows
                 os_version: ltsc2022
           steps:
+            - checkout: self
             - template: containers/container-template.yaml
               parameters:
                 arch: $(arch)
@@ -183,6 +148,7 @@ stages:
           pool:
             name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
           strategy:
+            maxParallel: 4
             matrix:
               azure_ipam_linux_arm64:
                 arch: arm64
@@ -205,6 +171,7 @@ stages:
                 name: npm
                 os: linux
           steps:
+            - checkout: self
             - template: containers/container-template.yaml
               parameters:
                 arch: $(arch)
@@ -217,12 +184,14 @@ stages:
         - containerize
       variables:
         Packaging.EnableSBOMSigning: false
+        ACN_DIR: $(Build.SourcesDirectory)
       jobs:
         - job: manifest
           displayName: Compile Manifests
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           strategy:
+            maxParallel: 4
             matrix:
               azure_ipam:
                 name: azure-ipam
@@ -433,6 +402,7 @@ stages:
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           strategy:
+            maxParallel: 4
             matrix:
               cilium_e2e:
                 name: cilium_e2e
@@ -496,6 +466,7 @@ stages:
           pool:
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           strategy:
+            maxParallel: 4
             matrix:
               swiftv2_e2e:
                 name: swiftv2_e2e

.pipelines/run-pipeline.yaml

@@ -16,10 +16,9 @@ parameters:
   type: string
   default: ''
 
-
 stages:
   - stage: setup
-    displayName: ACN
+    displayName: "[PreBuild] Configure and Provision Required Resources"
     # Block build start until pre-build validation occurs.
     dependsOn: pre_build
     variables:
@@ -85,21 +84,21 @@ stages:
               workingDirectory: $(ACN_DIR)
 
             - script: |
-                mkdir -p ./output/bins
                 cd ./output
                 find . -name '*.tgz' -print -exec mv -t ./bins/ {} +
                 find . -name '*.zip' -print -exec mv -t ./bins/ {} +
                 shopt -s extglob
                 rm -rf !("bins")
               name: "PrepareArtifacts"
               displayName: "Prepare Artifacts"
-
+              
             - task: CopyFiles@2
               inputs:
                 sourceFolder: "output"
                 targetFolder: $(Build.ArtifactStagingDirectory)
               condition: succeeded()
 
+
     - stage: containerize
       displayName: Build Images
       dependsOn:

.pipelines/template.trigger.jobs.yaml

@@ -53,7 +53,7 @@ jobs:
       TMPL_REPO_REF: '${{ parameters.mainRepoRef }}'
       TMPL_REPO_NAME: '${{ parameters.mainRepoName }}'
       TMPL_REPO_TYPE: '${{ parameters.mainRepoType }}'
-      ACCEPTED_REPO_REFS: '^refs/heads/feature/ob-onboard-0$'
+      ACCEPTED_REPO_REFS: '^refs/heads/feature/ob-onboard-2$'
       ACCEPTED_REPO_NAME: '^Azure/azure-container-networking$'
       ACCEPTED_REPO_TYPE: '^github$'
 

.pipelines/templates/log-template.yaml

@@ -268,8 +268,9 @@ steps:
       displayName: Windows Logs
       condition: always()
 
-  - publish: $(System.DefaultWorkingDirectory)/${{ parameters.clusterName }}_${{ parameters.logType }}_Attempt_#$(System.StageAttempt)
-    condition: always()
-    artifact: ${{ parameters.clusterName }}_${{ parameters.os }}${{ parameters.jobName }}_Attempt_#$(System.StageAttempt)
-    name: acnLogs_${{ parameters.logType }}
+  - task: 1ES.PublishPipelineArtifact@1
     displayName: Publish Cluster logs
+    condition: always()
+    inputs:
+      targetPath: $(System.DefaultWorkingDirectory)/${{ parameters.clusterName }}_${{ parameters.logType }}_Attempt_#$(System.StageAttempt)
+      artifactName: ${{ parameters.clusterName }}_${{ parameters.os }}${{ parameters.jobName }}_Attempt_#$(System.StageAttempt)

.pipelines/trigger.yaml

@@ -21,14 +21,19 @@ trigger: none
 #    include:
 #      - "*"
 
-
 resources:
   repositories:
+
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/stable
+
   - repository: azure-container-networking
     type: github
     name: Azure/azure-container-networking
     endpoint: 'Azure-ACN RO Service Connection'
-    ref: refs/heads/feature/ob-onboard-0
+    ref: refs/heads/feature/ob-onboard-2
 
 
 variables:
@@ -37,16 +42,11 @@ variables:
   REPO_NAME: $[ resources.repositories['azure-container-networking'].name ]
   REPO_TYPE: $[ resources.repositories['azure-container-networking'].type ]
   CHANGESET_COMMIT: $[ resources.repositories['self'].version ]
- 
-
-pool:
-  vmImage: ubuntu-latest
-
 
 extends:
-  template: /.pipelines/template.trigger.jobs.yaml@azure-container-networking
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
-    mainRepoRef: $(REPO_REF)
-    mainRepoCommit: $(REPO_COMMIT)
-    mainRepoName: $(REPO_NAME)
-    mainRepoType: $(REPO_TYPE)
+    pool:
+      name: "$(BUILD_POOL_NAME_DEFAULT)"
+    stages:
+    - template: /.pipelines/pipeline.yaml@azure-container-networking