Merge pull request #101 from cybozu-go/print-logs-on-e2e-test-failure

print controller logs on e2e test failure
cybozu-go · Jan 23, 2025 · 42bc2a0 · 42bc2a0
2 parents 9ab13e3 + d1310ef
commit 42bc2a0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git 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
diff --git 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())
 	})
 }