From f5dc501a943f40c92e2a48e42135e8ab6e5fb816 Mon Sep 17 00:00:00 2001 From: Shinya Hayashi Date: Tue, 21 Jan 2025 05:22:32 +0000 Subject: [PATCH 1/2] print controller logs on e2e test failure Signed-off-by: Shinya Hayashi --- test/e2e/Makefile | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 3d81c666..3e2d27fc 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -249,13 +249,31 @@ do_test: $(GINKGO) PATH=${PATH} \ E2ETEST=1 \ KUBECTL=$(KUBECTL) \ - $(GINKGO) --fail-fast -v $(GINKGO_FLAGS) singlek8s + $(GINKGO) --fail-fast -v $(GINKGO_FLAGS) singlek8s; \ + if [ "$$?" -ne 0 ]; then \ + echo "Controller logs for $(CEPH_CLUSTER1_NAMESPACE) namespace:"; \ + $(KUBECTL) logs --tail 100 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \ + echo ""; \ + echo "Controller logs for $(CEPH_CLUSTER2_NAMESPACE) namespace:"; \ + $(KUBECTL) logs --tail 100 -n $(CEPH_CLUSTER2_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \ + # Explicitly fail the test to mark the CI job as failed. \ + exit 1; \ + fi .PHONY: do-test-multik8s do-test-multik8s: $(GINKGO) + export KUBECTL_PRIMARY="$(MINIKUBE) -p $(MINIKUBE_PROFILE_PRIMARY) kubectl -- "; \ + export KUBECTL_SECONDARY="$(MINIKUBE) -p $(MINIKUBE_PROFILE_SECONDARY) kubectl -- "; \ env \ PATH=${PATH} \ E2ETEST=1 \ - KUBECTL_PRIMARY="$(MINIKUBE) -p $(MINIKUBE_PROFILE_PRIMARY) kubectl -- " \ - KUBECTL_SECONDARY="$(MINIKUBE) -p $(MINIKUBE_PROFILE_SECONDARY) kubectl -- " \ - $(GINKGO) --fail-fast -v $(GINKGO_FLAGS) $(addprefix multik8s/, $(TEST_MULTIK8S_PACKAGES)) + $(GINKGO) --fail-fast -v $(GINKGO_FLAGS) $(addprefix multik8s/, $(TEST_MULTIK8S_PACKAGES)); \ + if [ "$$?" -ne 0 ]; then \ + echo "Controller logs for $(MINIKUBE_PROFILE_PRIMARY):"; \ + $${KUBECTL_PRIMARY} logs --tail 100 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \ + echo ""; \ + echo "Controller logs for $(MINIKUBE_PROFILE_SECONDARY):"; \ + $${KUBECTL_SECONDARY} logs --tail 100 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \ + # Explicitly fail the test to mark the CI job as failed. \ + exit 1; \ + fi From d1310ef07dfaf78e149db32946adf5c4f64a46c9 Mon Sep 17 00:00:00 2001 From: Shinya Hayashi Date: Mon, 20 Jan 2025 08:40:17 +0000 Subject: [PATCH 2/2] fix the cluster name to wait for Signed-off-by: Shinya Hayashi --- test/e2e/multik8s/testutil/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/multik8s/testutil/util.go b/test/e2e/multik8s/testutil/util.go index 184763ee..3305d9e1 100644 --- a/test/e2e/multik8s/testutil/util.go +++ b/test/e2e/multik8s/testutil/util.go @@ -423,7 +423,7 @@ func WaitControllerToBeReady() { }).Should(Succeed()) Eventually(func() error { - return CheckDeploymentReady(PrimaryK8sCluster, CephClusterNamespace, "mantle-controller") + return CheckDeploymentReady(SecondaryK8sCluster, CephClusterNamespace, "mantle-controller") }).Should(Succeed()) }) }