Skip to content

Commit e125d1c

Browse files
committed
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 <[email protected]>
1 parent e2fe8a1 commit e125d1c

File tree

2 files changed

+14
-48
lines changed

2 files changed

+14
-48
lines changed

e2e/create-cluster_test.go

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -527,43 +527,6 @@ var _ = Describe("CreateCluster", func() {
527527
waitForTenantPods(ctx)
528528
})
529529

530-
It("creates a simple cluster with ephemeral VMs with Passt", Label("ephemeralVMs"), func() {
531-
By("generating cluster manifests from example template")
532-
cmd := exec.Command(ClusterctlPath, "generate", "cluster", "kvcluster",
533-
"--target-namespace", namespace,
534-
"--kubernetes-version", os.Getenv("TENANT_CLUSTER_KUBERNETES_VERSION"),
535-
"--control-plane-machine-count=1",
536-
"--worker-machine-count=1",
537-
"--from", "templates/cluster-template-passt-kccm.yaml")
538-
stdout, _ := RunCmd(cmd)
539-
Expect(os.WriteFile(manifestsFile, stdout, 0644)).To(Succeed())
540-
541-
By("posting cluster manifests example template")
542-
cmd = exec.Command(KubectlPath, "apply", "-f", manifestsFile)
543-
RunCmd(cmd)
544-
545-
By("Waiting for control plane")
546-
waitForControlPlane()
547-
548-
By("Waiting on kubevirt machines to bootstrap")
549-
waitForBootstrappedMachines()
550-
551-
By("Waiting on kubevirt machines to be ready")
552-
waitForMachineReadiness(2, 0)
553-
554-
By("Waiting for getting access to the tenant cluster")
555-
waitForTenantAccess(ctx, 2)
556-
557-
By("posting calico CNI manifests to the guest cluster and waiting for network")
558-
installCalicoCNI()
559-
560-
By("Waiting for node readiness")
561-
waitForNodeReadiness(ctx)
562-
563-
By("waiting all tenant Pods to be Ready")
564-
waitForTenantPods(ctx)
565-
})
566-
567530
It("should remediate a running VMI marked as being in a terminal state", Label("ephemeralVMs"), func() {
568531
By("generating cluster manifests from example template")
569532
cmd := exec.Command(ClusterctlPath, "generate", "cluster", "kvcluster",

hack/run-e2e.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
set -e -o pipefail
4+
set -x
45

56
TOOLS_DIR=${TOOLS_DIR:-hack/tools}
67

@@ -10,25 +11,27 @@ DUMP_VERSION=$(curl -L https://storage.googleapis.com/kubevirt-prow/devel/nightl
1011
DUMP_PATH=${TOOLS_DIR}/bin/kubevirt-${DUMP_VERSION}-dump
1112
TEST_WORKING_DIR=${TOOLS_DIR}/e2e-test-workingdir
1213
export ARTIFACTS=${ARTIFACTS:-k8s-reporter}
13-
mkdir -p $ARTIFACTS
14+
mkdir -p "${ARTIFACTS}"
1415

15-
if [ ! -f "$DUMP_PATH" ]; then
16-
curl -L https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/${DUMP_VERSION}/testing/dump -o $DUMP_PATH
17-
chmod 755 $DUMP_PATH
16+
if [ ! -f "${DUMP_PATH}" ]; then
17+
curl -L "https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/${DUMP_VERSION}/testing/dump" -o "$DUMP_PATH"
18+
chmod 755 "${DUMP_PATH}"
1819
fi
1920

2021
if [ ! -f "${CLUSTERCTL_PATH}" ]; then
2122
echo >&2 "Downloading clusterctl ..."
22-
curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.0/clusterctl-linux-amd64 -o ${CLUSTERCTL_PATH}
23-
chmod u+x ${CLUSTERCTL_PATH}
23+
curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/clusterctl-linux-amd64 -o "${CLUSTERCTL_PATH}"
24+
chmod +x "${CLUSTERCTL_PATH}"
2425
fi
2526

2627
if [ ! -f "${KUBECTL_PATH}" ]; then
2728
echo >&2 "Downloading kubectl ..."
28-
curl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -o ${KUBECTL_PATH}
29-
chmod u+x ${KUBECTL_PATH}
29+
# temporary taking a hard coded version, as the latest version is not found
30+
#curl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -o "${KUBECTL_PATH}"
31+
curl -L "https://dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl" -o "${KUBECTL_PATH}"
32+
chmod +x "${KUBECTL_PATH}"
3033
fi
3134

32-
rm -rf $TEST_WORKING_DIR
33-
mkdir -p $TEST_WORKING_DIR
34-
$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
35+
rm -rf "${TEST_WORKING_DIR}"
36+
mkdir -p "${TEST_WORKING_DIR}"
37+
"${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}"

0 commit comments

Comments
 (0)