Merge pull request #494 from umangachapagain/ocp-must-gather

adds OCP must-gather to tests

functests/setup_teardown.go

@@ -2,6 +2,8 @@ package functests
 
 import (
 	"flag"
+	"os"
+	"os/exec"
 
 	"github.com/onsi/gomega"
 	deploymanager "github.com/openshift/ocs-operator/pkg/deploy-manager"
@@ -30,6 +32,12 @@ func AfterTestSuiteCleanup() {
 	t, err := deploymanager.NewDeployManager()
 	gomega.Expect(err).To(gomega.BeNil())
 
+	// collect debug log before deleting namespace & cluster
+	gopath := os.Getenv("GOPATH")
+	cmd := exec.Command("/bin/bash", gopath+"/src/github.com/openshift/ocs-operator/hack/dump-debug-info.sh")
+	_, err = cmd.CombinedOutput()
+	gomega.Expect(err).To(gomega.BeNil())
+
 	err = t.DeleteNamespaceAndWait(TestNamespace)
 	gomega.Expect(err).To(gomega.BeNil())
 

hack/dump-debug-info.sh

@@ -3,23 +3,19 @@
 source hack/common.sh
 
 echo "dumping debug information"
-echo "--- PODS ----"
-${OCS_OC_PATH} get pods -n openshift-storage
-echo "---- PVs ----"
-${OCS_OC_PATH} get pv
-echo "--- StorageClasses ----"
-${OCS_OC_PATH} get storageclass --all-namespaces
-echo "--- StorageCluster ---"
-${OCS_OC_PATH} get storagecluster --all-namespaces -o yaml
-echo "--- CephCluster ---"
-${OCS_OC_PATH} get cephcluster --all-namespaces -o yaml
-echo "--- Noobaa ---"
-${OCS_OC_PATH} get noobaa --all-namespaces -o yaml
 
 echo "Running ocs-must-gather"
-MUST_GATHER_DIR="ocs-must-gather"
+OCS_MUST_GATHER_DIR="ocs-must-gather"
 if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then
-  MUST_GATHER_DIR="/tmp/artifacts/ocs-must-gather"
+  OCS_MUST_GATHER_DIR="/tmp/artifacts/ocs-must-gather"
 fi
-mkdir -p $MUST_GATHER_DIR
-${OCS_OC_PATH} adm must-gather --image "$MUST_GATHER_FULL_IMAGE_NAME" --dest-dir "$MUST_GATHER_DIR"
+mkdir -p $OCS_MUST_GATHER_DIR
+${OCS_OC_PATH} adm must-gather --image "$MUST_GATHER_FULL_IMAGE_NAME" --dest-dir "$OCS_MUST_GATHER_DIR"
+
+echo "Running ocp-must-gather"
+OCP_MUST_GATHER_DIR="ocp-must-gather"
+if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then
+  OCP_MUST_GATHER_DIR="/tmp/artifacts/ocp-must-gather"
+fi
+mkdir -p $OCP_MUST_GATHER_DIR
+${OCS_OC_PATH} --insecure-skip-tls-verify adm must-gather --dest-dir "$OCP_MUST_GATHER_DIR"

hack/functest.sh

@@ -9,7 +9,6 @@ $OUTDIR_BIN/functests --ocs-registry-image="${CATALOG_FULL_IMAGE_NAME}" \
 	--ocs-cluster-uninstall="${OCS_CLUSTER_UNINSTALL}" "$@"
 
 if [ $? -ne 0 ]; then
-	hack/dump-debug-info.sh
 	echo "ERROR: Functest failed."
 	exit 1
 fi