From 2d3e561a00a81ece6311ecd731908a8eb2340968 Mon Sep 17 00:00:00 2001
From: subhamkrai <srai@redhat.com>
Date: Tue, 19 Dec 2023 17:23:52 +0530
Subject: [PATCH] ci: improve collect-log script

I was debugging helm tests, I noticed, the operator namespace
content is empty and operator is created in same namespace as
other pods. Also, let's collect the 'kube-system' namespace logs
in multus test only as that is the only test where we need to debug
cluster networking and require kube-system logs.

Signed-off-by: subhamkrai <srai@redhat.com>
---
 .github/workflows/integration-test-helm-suite.yaml | 1 -
 tests/scripts/collect-logs.sh                      | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-test-helm-suite.yaml b/.github/workflows/integration-test-helm-suite.yaml
index 107da7510..02bd0b3dc 100644
--- a/.github/workflows/integration-test-helm-suite.yaml
+++ b/.github/workflows/integration-test-helm-suite.yaml
@@ -58,7 +58,6 @@ jobs:
         run: |
           export LOG_DIR="/home/runner/work/rook/rook/tests/integration/_output/tests/"
           export CLUSTER_NAMESPACE="helm-ns"
-          export OPERATOR_NAMESPACE="helm-ns-system"
           tests/scripts/collect-logs.sh
 
       - name: Artifact
diff --git a/tests/scripts/collect-logs.sh b/tests/scripts/collect-logs.sh
index 80c749962..637d446a5 100755
--- a/tests/scripts/collect-logs.sh
+++ b/tests/scripts/collect-logs.sh
@@ -18,7 +18,6 @@ $CEPH_CMD osd dump >"${LOG_DIR}"/ceph-osd-dump.txt
 $CEPH_CMD report >"${LOG_DIR}"/ceph-report.txt
 
 NAMESPACES=("$CLUSTER_NAMESPACE")
-NAMESPACES+=("$KUBE_SYSTEM_NAMESPACE")
 if [[ "$OPERATOR_NAMESPACE" != "$CLUSTER_NAMESPACE" ]]; then
   NAMESPACES+=("$OPERATOR_NAMESPACE")
 fi
@@ -27,6 +26,11 @@ if [ "$1" == "multi-cluster-mirroring" ]; then
   NAMESPACES+=("rook-ceph-secondary")
 fi
 
+# Add kube-system namespace for multus test only as we need to debug network in multus test
+if [ "$1" == "canary-multus" ]; then
+  NAMESPACES+=("$KUBE_SYSTEM_NAMESPACE")
+fi
+
 for NAMESPACE in "${NAMESPACES[@]}"; do
   # each namespace is a sub-directory for easier debugging
   NS_DIR="${LOG_DIR}"/namespace-"${NAMESPACE}"