From bd49e642e216b5eea111d58659d38d13314c3d44 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Mon, 6 Nov 2023 13:38:58 -0800 Subject: [PATCH 1/2] ci: delete cluster stage --- .pipelines/cni/cilium/nightly-release-test.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml index 9cb7acc9ae..4acd6155dc 100644 --- a/.pipelines/cni/cilium/nightly-release-test.yml +++ b/.pipelines/cni/cilium/nightly-release-test.yml @@ -100,12 +100,18 @@ stages: clusterName: ciliumnightly-$(commitID) os: linux cni: cilium + + - stage: delete + displayName: Delete Clusters + condition: always() + dependsOn: + - setup + - cilium_nightly + variables: + commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ] + jobs: - job: delete displayName: Delete Cluster - condition: always() - dependsOn: - - cilium_nightly - - logs pool: name: "$(BUILD_POOL_NAME_DEFAULT)" strategy: @@ -119,4 +125,3 @@ stages: name: $(name) clusterName: $(clusterName)-$(commitID) region: $(LOCATION) - From ca9c7505819e18b8ea7ea651573b0cb72cfe7e53 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Tue, 7 Nov 2023 08:05:25 -0800 Subject: [PATCH 2/2] ci: add parameter for cilium commit ID --- .pipelines/cni/cilium/nightly-release-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml index 4acd6155dc..a1eb33c949 100644 --- a/.pipelines/cni/cilium/nightly-release-test.yml +++ b/.pipelines/cni/cilium/nightly-release-test.yml @@ -28,6 +28,9 @@ stages: cd .pipelines/ git clone https://github.com/cilium/cilium.git cd cilium + if [ ! -z $CILIUM_COMMIT_ID ]; then + git reset --hard $CILIUM_COMMIT_ID + fi make docker-cilium-image make docker-operator-generic-image name: BuildCiliumImage