Address review comments #2

rancher · Jan 19, 2024 · df6e08e · df6e08e
1 parent 926661c
commit df6e08e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/tests/assets/cluster-airgap.yaml b/tests/assets/cluster-airgap.yaml
@@ -20,8 +20,8 @@ spec:
         machineConfigRef:
           apiVersion: elemental.cattle.io/v1beta1
           kind: MachineInventorySelectorTemplate
-          name: selector-%CLUSTER_NAME%
-        name: pool-%CLUSTER_NAME%
+          name: selector-master-%CLUSTER_NAME%
+        name: pool-master-%CLUSTER_NAME%
         quantity: 3
         unhealthyNodeTimeout: 0s
         workerRole: true

diff --git a/tests/e2e/airgap_test.go b/tests/e2e/airgap_test.go
@@ -28,7 +28,6 @@ import (
 )
 
 var _ = Describe("E2E - Build the airgap archive", Label("prepare-archive"), func() {
-
 	It("Execute the script to build the archive", func() {
 		err := exec.Command("sudo", airgapBuildScript, k8sUpstreamVersion, certManagerVersion, rancherChannel, k8sVersion).Run()
 		Expect(err).To(Not(HaveOccurred()))
@@ -50,7 +49,7 @@ var _ = Describe("E2E - Deploy K3S/Rancher in airgap environment", Label("airgap
 		})
 
 		By("Downloading the qcow2 image from GCP storage", func() {
-			err := exec.Command("/opt/google-cloud-sdk/bin/gcloud", "storage", "cp", "gs://elemental-airgap-image/rancher-image.qcow2", "/home/gh-runner/rancher-image.qcow2").Run()
+			err := exec.Command("/opt/google-cloud-sdk/bin/gcloud", "storage", "cp", "gs://elemental-airgap-image/rancher-image.qcow2", os.Getenv("HOME")+"/rancher-image.qcow2").Run()
 			Expect(err).To(Not(HaveOccurred()))
 		})
 
@@ -59,7 +58,7 @@ var _ = Describe("E2E - Deploy K3S/Rancher in airgap environment", Label("airgap
 				"--name", "rancher-manager",
 				"--memory", "4096",
 				"--vcpus", "2",
-				"--disk", "path=/home/gh-runner/rancher-image.qcow2,bus=sata",
+				"--disk", "path="+os.Getenv("HOME")+"rancher-image.qcow2,bus=sata",
 				"--import",
 				"--os-variant", "opensuse-unknown",
 				"--network=default,mac=52:54:00:00:00:10",
@@ -78,7 +77,7 @@ var _ = Describe("E2E - Deploy K3S/Rancher in airgap environment", Label("airgap
 		}
 
 		// Get the version of the Elemental Operator
-		out, err := exec.Command("bash", "-c", "ls /opt/rancher/helm/elemental-operator-chart-*.tgz | cut -d '-' -f 4").CombinedOutput()
+		out, err := exec.Command("bash", "-c", "ls /opt/rancher/helm/elemental-operator-chart-*.tgz | cut -d '-' -f 4").Output()
 		Expect(err).To(Not(HaveOccurred()))
 		elementalVersion := strings.Trim(string(out), "\n")
 
@@ -165,7 +164,7 @@ var _ = Describe("E2E - Deploy K3S/Rancher in airgap environment", Label("airgap
 
 		By("Installing Rancher", func() {
 			// TODO: Use the DeployRancherManager function from install.go
-			rancherAirgapVersion, err := exec.Command("bash", "-c", "ls /opt/rancher/helm/rancher-*.tgz").CombinedOutput()
+			rancherAirgapVersion, err := exec.Command("bash", "-c", "ls /opt/rancher/helm/rancher-*.tgz").Output()
 			// Set flags for Rancher Manager installation
 			flags := []string{
 				"upgrade", "--install", "rancher", string(rancherAirgapVersion),