ci: Use Git Ref Under Review for Testing

Azure · Sep 4, 2024 · 2703f8c · 2703f8c
1 parent 5908897
commit 2703f8c
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 36 deletions.
diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
@@ -19,7 +19,8 @@ jobs:
       ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
       ob_git_checkout: true
     steps:
-      - checkout: azure-container-networking
+      - checkout: ACNReviewChanges
+        clean: true
 
       - task: AzureCLI@2
         inputs:

diff --git a/.pipelines/run-pipeline.yaml b/.pipelines/run-pipeline.yaml
@@ -1,4 +1,5 @@
 parameters:
+
 - name: triggerBuildSourceBranch
   type: string
   default: ''
@@ -26,11 +27,12 @@ stages:
           isCustom: true
           type: linux
           name: "$(BUILD_POOL_NAME_DEFAULT)"
-        #variables:
+        variables:
           #cob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
-          #ob_git_checkout: true
+          ob_git_checkout: true
         steps:
-          - checkout: none
+          - checkout: ACNTools
+            clean: true
 
           - 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
@@ -71,7 +73,8 @@ stages:
             type: linux
             name: "$(BUILD_POOL_NAME_DEFAULT)"
           steps:
-            - checkout: azure-container-networking
+            - checkout: ACNReviewChanges
+              clean: true
 
             - script: |
                 cd azure-container-networking
@@ -196,7 +199,8 @@ stages:
             ob_artifactSuffix: $(Suffix) # this is needed to not collide published artifact containers
             ob_git_checkout: true
           steps:
-            - checkout: azure-container-networking
+            - checkout: ACNReviewChanges
+              clean: true
 
             - template: containers/container-template.yaml
               parameters:
@@ -242,7 +246,8 @@ stages:
                 name: npm
                 os: linux
           steps:
-            - checkout: azure-container-networking
+            - checkout: ACNReviewChanges
+              clean: true
 
             - template: containers/container-template.yaml
               parameters:
@@ -294,7 +299,8 @@ stages:
                 os_versions: ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
           steps:
-            - checkout: azure-container-networking
+            - checkout: ACNReviewChanges
+              clean: true
 
             - template: containers/manifest-template.yaml
               parameters:
@@ -506,7 +512,8 @@ stages:
                 name: swiftv2_dummy_e2e
                 clusterName: "swiftv2dummy"
           steps:
-            - checkout: azure-container-networking
+            - checkout: ACNReviewChanges
+              clean: true
 
             - template: templates/delete-cluster.yaml
               parameters:

diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -58,7 +58,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: e2e-step-template.yaml
@@ -93,7 +93,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/aks/e2e-job-template.yaml b/.pipelines/singletenancy/aks/e2e-job-template.yaml
@@ -59,7 +59,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: e2e-step-template.yaml
@@ -98,7 +98,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -55,7 +55,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: azure-cni-overlay-e2e-step-template.yaml
@@ -79,7 +79,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - task: AzureCLI@2
@@ -116,7 +116,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: azure-cni-overlay-e2e-step-template.yaml
@@ -165,7 +165,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_linux_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:
@@ -187,11 +188,11 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_windows_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               os: windows
               cni: cniv2
-
diff --git a/...ines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml b/...ines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -54,7 +54,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: cilium-dualstackoverlay-e2e-step-template.yaml
@@ -89,7 +89,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -57,7 +57,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: cilium-overlay-e2e-step-template.yaml
@@ -93,7 +93,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -56,7 +56,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: cilium-overlay-e2e-step-template.yaml
@@ -91,7 +91,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -59,7 +59,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: cilium-e2e-step-template.yaml
@@ -94,7 +94,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -56,7 +56,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: dualstackoverlay-e2e-step-template.yaml
@@ -80,7 +80,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - task: AzureCLI@2
@@ -116,7 +116,7 @@ stages:
           ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
             clean: true
 
           - template: dualstackoverlay-e2e-step-template.yaml
@@ -165,7 +165,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_linux_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:
@@ -187,7 +188,8 @@ stages:
           ob_outputDirectory: $(ACN_DIR)/${{ parameters.clusterName }}-$(commitID)_FailedE2ELogs_windows_Attempt_#$(System.StageAttempt)
           ob_git_checkout: true
         steps:
-          - checkout: azure-container-networking
+          - checkout: ACNReviewChanges
+            clean: true
 
           - template: ../../templates/log-template.yaml
             parameters:

diff --git a/.pipelines/templates/create-cluster-swiftv2.yaml b/.pipelines/templates/create-cluster-swiftv2.yaml
@@ -13,7 +13,7 @@ jobs:
       ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
       ob_git_checkout: true
     steps:
-      - checkout: azure-container-networking
+      - checkout: ACNReviewChanges
         clean: true
 
       - task: AzureCLI@2

diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml
@@ -22,7 +22,7 @@ jobs:
       ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
       ob_git_checkout: true
     steps:
-      - checkout: azure-container-networking
+      - checkout: ACNReviewChanges
         clean: true
 
       - task: AzureCLI@2

diff --git a/.pipelines/templates/run-unit-tests.yaml b/.pipelines/templates/run-unit-tests.yaml
@@ -14,7 +14,10 @@ stages:
           type: linux
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         steps:
-          - checkout: azure-container-networking
+          # Test changes under review
+          - checkout: ACNReviewChanges
+            clean: true
+
           - script: |
               cd azure-container-networking
               make tools
@@ -45,7 +48,10 @@ stages:
           type: windows
           name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS_ALT)"
         steps:
-          - checkout: azure-container-networking
+          # Test changes under review
+          - checkout: ACNReviewChanges
+            clean: true
+
           - script: |
               cd azure-container-networking/
               cd npm/

diff --git a/.pipelines/trigger.yaml b/.pipelines/trigger.yaml
@@ -11,6 +11,7 @@ pr:
       - ".github"
       - docs
 
+
 trigger:
   branches:
     include:
@@ -19,16 +20,19 @@ trigger:
     include:
       - "*"
 
+
 pool:
   vmImage: ubuntu-latest
 
+
 variables:
   ADO_COMPLIANT_BUILD_PROJECT_URI: $(VAR_PROJECT_URI)
   ADO_COMPLIANT_BUILD_ORG: $(VAR_BUILD_ORG)
   ADO_AUTH_METHOD: $(VAR_AUTH_METHOD)
   ADO_AUTHORIZATION: $(VAR_AUTH)
   ADO_COMPLIANT_PIPELINE_ID: $(VAR_PIPELINE_ID)
 
+
 jobs:
 - job: trigger
   displayName: Test ACN Pull Request Changes