From d357ccd92c33d8eb3d70de9994b3ccdb32fb5d35 Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Tue, 15 Aug 2023 06:23:12 -0700
Subject: [PATCH 1/2] fix: Add back cluster create/delete

---
 .../cni/cilium/nightly-release-test.yml       | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml
index 9fd9f37527..f0cf4a94be 100644
--- a/.pipelines/cni/cilium/nightly-release-test.yml
+++ b/.pipelines/cni/cilium/nightly-release-test.yml
@@ -2,6 +2,20 @@ pr: none
 trigger: none
 
 stages:
+  - stage: setup
+    displayName: Setup
+    jobs:
+      - job: env
+        displayName: Setup
+        pool:
+          name: "$(BUILD_POOL_NAME_DEFAULT)"
+        steps:
+          - script: |
+              echo "##vso[task.setvariable variable=commitID;isOutput=true]$(make revision)"
+            name: "EnvironmentalVariables"
+            displayName: "Set environmental variables"
+            condition: always()
+
   - stage: init
     displayName: "Build and Push Cilium Image"
     jobs:
@@ -40,14 +54,31 @@ stages:
             inputs:
               containerRegistry: $(CONTAINER_REGISTRY)
               command: "logout"
+
   - stage: cilium_nightly
     displayName: E2E - Cilium Nightly
+    dependsOn:
+      - init
+      - setup
     variables:
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
       GOBIN: "$(GOPATH)/bin" # Go binaries path
       modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
+      commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
     jobs:
+      - template: ../../templates/create-cluster.yaml
+        parameters:
+          name: cilium_overlay_nightly
+          displayName: Cilium on AKS Overlay
+          clusterType: cilium-overlay-up
+          clusterName: ciliumnightly-$(commitID)
+          vmSize: Standard_B2ms
+          k8sVersion: ""
+          dependsOn: ""
+          region: $(LOCATION)
       - job: cilium_nightly
+        dependsOn:
+          - cilium_overlay_nightly
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
         steps:
@@ -55,4 +86,22 @@ stages:
           parameters:
             name: "cilium_nightly"
             testDropgz: ""
-            clusterName: "ciliumnightly"
+            clusterName: ciliumnightly-$(commitID)
+      - job: delete
+        displayName: Delete Cluster
+        dependsOn:
+          - cilium_nightly
+        pool:
+          name: "$(BUILD_POOL_NAME_DEFAULT)"
+        strategy:
+          matrix:
+            cilium_nightly:
+              name: ciliumnightly
+              clusterName: overlaynightly
+        steps:
+          - template: ../../templates/delete-cluster.yaml
+            parameters:
+              name: $(name)
+              clusterName: $(clusterName)-$(commitID)
+              region: $(LOCATION)
+

From 9ae73025be850c09597b8825c2e260e113b1014c Mon Sep 17 00:00:00 2001
From: jpayne3506 <payne.3506@gmail.com>
Date: Tue, 15 Aug 2023 06:40:22 -0700
Subject: [PATCH 2/2] Addressing Comments

---
 .pipelines/cni/cilium/nightly-release-test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml
index f0cf4a94be..83c45c81c8 100644
--- a/.pipelines/cni/cilium/nightly-release-test.yml
+++ b/.pipelines/cni/cilium/nightly-release-test.yml
@@ -77,6 +77,7 @@ stages:
           dependsOn: ""
           region: $(LOCATION)
       - job: cilium_nightly
+        displayName: Cilium Overlay Nightly E2E
         dependsOn:
           - cilium_overlay_nightly
         pool:
@@ -89,6 +90,7 @@ stages:
             clusterName: ciliumnightly-$(commitID)
       - job: delete
         displayName: Delete Cluster
+        condition: always()
         dependsOn:
           - cilium_nightly
         pool: