From 0ab1ef4155848d62d0ba77ec652ca55f087b9e25 Mon Sep 17 00:00:00 2001
From: yiannistri <8741709+yiannistri@users.noreply.github.com>
Date: Wed, 26 Jun 2024 11:33:32 +0100
Subject: [PATCH] ci: Override the image tag to use latest version of
 release/v2.9 from Rancher

---
 test/e2e/config/config.yaml |  3 ++-
 test/e2e/suite_test.go      | 27 +++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/test/e2e/config/config.yaml b/test/e2e/config/config.yaml
index 975ac4e2..136c1f59 100644
--- a/test/e2e/config/config.yaml
+++ b/test/e2e/config/config.yaml
@@ -9,4 +9,5 @@ certManagerVersion: v1.9.2
 certManagerChartURL: https://charts.jetstack.io/charts/cert-manager-${CERT_MANAGER_VERSION}.tgz
 
 rancherVersion: v2.9-head
-rancherChartURL: https://releases.rancher.com/server-charts/latest/rancher-${RANCHER_VERSION}.tgz
+# Install the latest chart from the rancher repo but override the image tag
+rancherChartURL: https://releases.rancher.com/server-charts/latest/
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
index 17b63020..8dd2c2bb 100644
--- a/test/e2e/suite_test.go
+++ b/test/e2e/suite_test.go
@@ -111,7 +111,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 
 	By("Deploying rancher and cert-manager", func() {
-		By("installing cert-manager", func() {
+		By("Installing cert-manager", func() {
 			if isDeploymentReady(certManagerNamespace, certManagerName) {
 				By("already installed")
 			} else {
@@ -134,14 +134,31 @@ var _ = BeforeSuite(func() {
 			}
 		})
 
-		By("installing rancher", func() {
+		By("Adding rancher helm chart repository", func() {
+			Expect(kubectl.RunHelmBinaryWithCustomErr(
+				"repo",
+				"add",
+				"--force-update",
+				"rancher-latest",
+				fmt.Sprintf(e2eCfg.RancherChartURL),
+			)).To(Succeed())
+		})
+
+		By("Update helm repositories", func() {
+			Expect(kubectl.RunHelmBinaryWithCustomErr(
+				"repo",
+				"update",
+			)).To(Succeed())
+		})
+
+		By("Installing rancher", func() {
 			if isDeploymentReady(cattleSystemNamespace, rancherName) {
 				By("already installed")
 			} else {
 				Expect(kubectl.RunHelmBinaryWithCustomErr(
+					"install",
 					"-n",
 					cattleSystemNamespace,
-					"install",
 					"--set",
 					"bootstrapPassword=admin",
 					"--set",
@@ -154,8 +171,10 @@ var _ = BeforeSuite(func() {
 					"global.cattle.psp.enabled=false",
 					"--set", fmt.Sprintf("hostname=%s.%s", e2eCfg.ExternalIP, e2eCfg.MagicDNS),
 					"--create-namespace",
+					"--devel",
+					"--set", fmt.Sprintf("rancherImageTag=%s", e2eCfg.RancherVersion),
 					rancherName,
-					fmt.Sprintf(e2eCfg.RancherChartURL),
+					"rancher-latest/rancher",
 				)).To(Succeed())
 				Eventually(func() bool {
 					return isDeploymentReady(cattleSystemNamespace, rancherName)