Cleanup

Author: willie-yao

templates/test/ci/cluster-template-prow-azl3.yaml

@@ -9,7 +9,7 @@ spec:
         computeGallery:
           gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
           name: capi-azurelinux-3
-          version: ${AZL3_VERSION:="1.33.2"}
+          version: ${AZL3_VERSION}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureMachineTemplate
@@ -22,4 +22,4 @@ spec:
         computeGallery:
           gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
           name: capi-azurelinux-3
-          version: ${AZL3_VERSION:="1.33.2"}
+          version: ${AZL3_VERSION}

templates/test/ci/cluster-template-prow-ci-version-azl3.yaml

@@ -110,17 +110,14 @@ var _ = Describe("Workload cluster creation", func() {
 
 		CheckTestBeforeCleanup()
 
-		// Skip cleanup for Azure Linux 3 test for debugging purposes
-		localSkipCleanup := skipCleanup || (clusterName != "" && strings.Contains(clusterName, "azl3"))
-
 		cleanInput := cleanupInput{
 			SpecName:               specName,
 			Cluster:                result.Cluster,
 			ClusterProxy:           bootstrapClusterProxy,
 			Namespace:              namespace,
 			CancelWatches:          cancelWatches,
 			IntervalsGetter:        e2eConfig.GetIntervals,
-			SkipCleanup:            localSkipCleanup,
+			SkipCleanup:            skipCleanup,
 			SkipLogCollection:      skipLogCollection,
 			AdditionalCleanup:      additionalCleanup,
 			ArtifactFolder:         artifactFolder,