e2e: Gather cluster-info on test failure

This is a leftover from - k8snetworkplumbingwg#534 Prior to this commit, `kubectl cluster-info ...` is invoked only if the conformance tests does not fail, which is not that useful. Signed-off-by: Andrea Panattoni <[email protected]>
zeeke · Nov 3, 2023 · a843b3b · a843b3b
1 parent b4f519a
commit a843b3b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh
@@ -407,9 +407,17 @@ if [ -z $SKIP_TEST ]; then
     export JUNIT_OUTPUT="${root}/${TEST_REPORT_PATH}/conformance-test-report"
   fi
 
+  # Disable exit on error temporarily to gather cluster information
+  set +e
   SUITE=./test/conformance hack/run-e2e-conformance.sh
+  TEST_EXITE_CODE=$?
+  set -e
 
   if [[ -v TEST_REPORT_PATH ]]; then
     kubectl cluster-info dump --namespaces ${NAMESPACE} --output-directory "${root}/${TEST_REPORT_PATH}/cluster-info"
   fi
+
+  if [[ $TEST_EXITE_CODE -ne 0 ]]; then
+    exit $TEST_EXITE_CODE
+  fi
 fi
diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh
@@ -274,9 +274,17 @@ if [ -z $SKIP_TEST ]; then
     export JUNIT_OUTPUT="${root}/${TEST_REPORT_PATH}/conformance-test-report"
   fi
 
+  # Disable exit on error temporarily to gather cluster information
+  set +e
   SUITE=./test/conformance hack/run-e2e-conformance.sh
+  TEST_EXITE_CODE=$?
+  set -e
 
   if [[ -v TEST_REPORT_PATH ]]; then
     kubectl cluster-info dump --namespaces ${NAMESPACE} --output-directory "${root}/${TEST_REPORT_PATH}/cluster-info"
   fi
+
+  if [[ $TEST_EXITE_CODE -ne 0 ]]; then
+    exit $TEST_EXITE_CODE
+  fi
 fi