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}"