From 5538aedf0b48745f7d30e5b69e1a53a86db20ce0 Mon Sep 17 00:00:00 2001
From: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
Date: Wed, 18 Oct 2023 17:06:15 +0300
Subject: [PATCH] Remove an old, non relevant e2e test

Remove the "creates a simple cluster with ephemeral VMs with Passt" e2e
test, as it's not needed anymore.

Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
---
 e2e/create-cluster_test.go | 37 -------------------------------------
 hack/run-e2e.sh            | 17 +++++++++--------
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/e2e/create-cluster_test.go b/e2e/create-cluster_test.go
index ede0016d..03aee64a 100644
--- a/e2e/create-cluster_test.go
+++ b/e2e/create-cluster_test.go
@@ -527,43 +527,6 @@ var _ = Describe("CreateCluster", func() {
 		waitForTenantPods(ctx)
 	})
 
-	It("creates a simple cluster with ephemeral VMs with Passt", Label("ephemeralVMs"), func() {
-		By("generating cluster manifests from example template")
-		cmd := exec.Command(ClusterctlPath, "generate", "cluster", "kvcluster",
-			"--target-namespace", namespace,
-			"--kubernetes-version", os.Getenv("TENANT_CLUSTER_KUBERNETES_VERSION"),
-			"--control-plane-machine-count=1",
-			"--worker-machine-count=1",
-			"--from", "templates/cluster-template-passt-kccm.yaml")
-		stdout, _ := RunCmd(cmd)
-		Expect(os.WriteFile(manifestsFile, stdout, 0644)).To(Succeed())
-
-		By("posting cluster manifests example template")
-		cmd = exec.Command(KubectlPath, "apply", "-f", manifestsFile)
-		RunCmd(cmd)
-
-		By("Waiting for control plane")
-		waitForControlPlane()
-
-		By("Waiting on kubevirt machines to bootstrap")
-		waitForBootstrappedMachines()
-
-		By("Waiting on kubevirt machines to be ready")
-		waitForMachineReadiness(2, 0)
-
-		By("Waiting for getting access to the tenant cluster")
-		waitForTenantAccess(ctx, 2)
-
-		By("posting calico CNI manifests to the guest cluster and waiting for network")
-		installCalicoCNI()
-
-		By("Waiting for node readiness")
-		waitForNodeReadiness(ctx)
-
-		By("waiting all tenant Pods to be Ready")
-		waitForTenantPods(ctx)
-	})
-
 	It("should remediate a running VMI marked as being in a terminal state", Label("ephemeralVMs"), func() {
 		By("generating cluster manifests from example template")
 		cmd := exec.Command(ClusterctlPath, "generate", "cluster", "kvcluster",
diff --git a/hack/run-e2e.sh b/hack/run-e2e.sh
index 2372347f..3c7e1984 100755
--- a/hack/run-e2e.sh
+++ b/hack/run-e2e.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e -o pipefail
+set -x
 
 TOOLS_DIR=${TOOLS_DIR:-hack/tools}
 
@@ -10,25 +11,25 @@ DUMP_VERSION=$(curl -L https://storage.googleapis.com/kubevirt-prow/devel/nightl
 DUMP_PATH=${TOOLS_DIR}/bin/kubevirt-${DUMP_VERSION}-dump
 TEST_WORKING_DIR=${TOOLS_DIR}/e2e-test-workingdir
 export ARTIFACTS=${ARTIFACTS:-k8s-reporter}
-mkdir -p $ARTIFACTS
+mkdir -p "${ARTIFACTS}"
 
 if [ ! -f "$DUMP_PATH" ]; then
-    curl -L https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/${DUMP_VERSION}/testing/dump -o $DUMP_PATH
-    chmod 755 $DUMP_PATH
+    curl -L "https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/${DUMP_VERSION}/testing/dump" -o "$DUMP_PATH"
+    chmod 755 "$DUMP_PATH"
 fi
 
 if [ ! -f "${CLUSTERCTL_PATH}" ]; then
 	echo >&2 "Downloading clusterctl ..."
-	curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.0/clusterctl-linux-amd64 -o ${CLUSTERCTL_PATH}
-	chmod u+x ${CLUSTERCTL_PATH}
+	curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/clusterctl-linux-amd64 -o "${CLUSTERCTL_PATH}"
+	chmod u+x "${CLUSTERCTL_PATH}"
 fi
 
 if [ ! -f "${KUBECTL_PATH}" ]; then
 	echo >&2 "Downloading kubectl ..."
-	curl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -o ${KUBECTL_PATH}
-	chmod u+x ${KUBECTL_PATH}
+	curl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -o "${KUBECTL_PATH}"
+	chmod u+x "${KUBECTL_PATH}"
 fi
 
 rm -rf $TEST_WORKING_DIR
 mkdir -p $TEST_WORKING_DIR
-$BIN_DIR/e2e.test -ginkgo.v -test.v -ginkgo.no-color --kubectl-path $KUBECTL_PATH --clusterctl-path $CLUSTERCTL_PATH  --working-dir $TEST_WORKING_DIR --dump-path $DUMP_PATH
+"${BIN_DIR}/e2e.test" -ginkgo.v -test.v -ginkgo.no-color --kubectl-path "${KUBECTL_PATH}" --clusterctl-path "${CLUSTERCTL_PATH}"  --working-dir "${TEST_WORKING_DIR}" --dump-path "${DUMP_PATH}"