chore: Update CI workflow and integration test scripts to improve logging and test execution flow

Author: ggazzo

.github/workflows/ci.yml

@@ -655,14 +655,26 @@ jobs:
           # List loaded images
           docker images
 
-      - name: Run federation integration tests with pre-built image
+      - name: Start federation services
         working-directory: ./ee/packages/federation-matrix
         env:
           ROCKETCHAT_IMAGE: ghcr.io/${{ needs.release-versions.outputs.lowercase-repo }}/rocket.chat:${{ needs.release-versions.outputs.gh-docker-tag }}-amd64
           ENTERPRISE_LICENSE_RC1: ZAikY+LLaal7mT6RNYxpyWEmMQyucrl50/7pYBXqHczc90j+RLwF+T0xuCT2pIpKMC5DxcZ1TtkV6MYJk5whrwmap+mQ0FV+VpILJlL0i4T21K4vMfzZXTWm/pzcAy2fMTUNH+mUA9HTBD6lYYh40KnbGXPAd80VbZk0MO/WbWBm2dOT0YCwfvlRyurRqkDAQrftLaffzCNUsMKk0fh+MKs73UDHZQDp1yvs7WoGpPu5ZVi5mTBOt3ZKVz5KjGfClLwJptFPmW1w6nKelAiJBDPpjcX1ylfjxpnBoixko7uN52zlyaeoAYwfRcdDLnZ8k0Ou6tui/vTQUXjGIjHw2AhMaKwonn4E9LYpuA1KEXt08qJL5J3ZtjSCV1T+A9Z3zFhhLgp5dxP/PPUbxDn/P8XKp7nXM9duIfcCMlnea7V8ixEyCHwwvKQaXVVidcsUGtB8CwS0GlsAEBLOzqMehuQUK2rdQ4WgEz3AYveikeVvSzgBHvyXsxssWAThc0Mht0eEJqdDhUB2QeZ2WmPsaSSD639Z4WgjSUoR0zh8bfqepH+2XRcUryXe2yN+iU+3POzi9wfg0k65MxXT8pBg3PD5RHnR8oflEP0tpZts33JiBhYRxX3MKplAFm4dMuphTsDJTh+e534pT7IPuZF79QSVaLEWZfVVVb7nGFtmMwA=
           QASE_TESTOPS_JEST_API_TOKEN: ${{ secrets.QASE_TESTOPS_JEST_API_TOKEN }}
           PR_NUMBER: ${{ github.event.number }}
-        run: yarn test:integration --image "${ROCKETCHAT_IMAGE}"
+        run: yarn test:integration:start-containers-only --image "${ROCKETCHAT_IMAGE}"
+
+      - name: Run federation integration tests
+        working-directory: ./ee/packages/federation-matrix
+        env:
+          QASE_TESTOPS_JEST_API_TOKEN: ${{ secrets.QASE_TESTOPS_JEST_API_TOKEN }}
+          PR_NUMBER: ${{ github.event.number }}
+        run: yarn test:integration:ci
+
+      - name: Show federation integration tests logs
+        if: failure()
+        working-directory: ./ee/packages/federation-matrix
+        run: yarn test:integration:logs
 
       - name: Show rc server logs if tests failed
         if: failure()

ee/packages/federation-matrix/package.json

@@ -13,7 +13,10 @@
 		"lint": "eslint .",
 		"lint:fix": "eslint --fix .",
 		"test": "jest",
+		"test:integration:logs": "./tests/scripts/run-integration-tests.sh --logs",
+		"test:integration:start-containers-only": "./tests/scripts/run-integration-tests.sh --start-containers-only",
 		"test:integration": "./tests/scripts/run-integration-tests.sh",
+		"test:integration:ci": "./tests/scripts/run-integration-tests.sh --ci",
 		"test:federation": "jest --config jest.config.federation.ts",
 		"testunit": "jest",
 		"typecheck": "tsc --noEmit"

ee/packages/federation-matrix/tests/scripts/run-integration-tests.sh

@@ -35,9 +35,27 @@ PREBUILT_IMAGE=""
 INTERRUPTED=false
 PROFILE_PREFIX="local"  # Default to local build
 NO_TEST=false
+CI=false
+LOGS=false
+
 
 while [[ $# -gt 0 ]]; do
     case $1 in
+        --start-containers-only)
+            NO_TEST=true
+            KEEP_RUNNING=true
+            shift
+            ;;
+        --ci)
+            CI=true
+            KEEP_RUNNING=true
+            shift
+            ;;
+        --logs)
+            LOGS=true
+            NO_TEST=true
+            shift
+            ;;
         --keep-running)
             KEEP_RUNNING=true
             shift
@@ -102,35 +120,43 @@ log_error() {
     echo -e "${RED}❌ [$(date '+%Y-%m-%d %H:%M:%S')] $1${NC}"
 }
 
+docker_log() {
+    local container=$1
+    if docker ps -q -f name=$container | grep -q .; then
+        docker logs $container 2>&1 | sed 's/^/  /'
+    else
+        echo "  $container container not found or no logs"
+    fi
+}
+
+docker_logs() {
+    echo ""
+    echo "ROCKET.CHAT (rc1) LOGS:"
+    echo "----------------------------------------"
+    docker_log "rc1"
+
+    echo ""
+    echo "SYNAPSE (hs1) LOGS:"
+    echo "----------------------------------------"
+    docker_log "hs1"
+
+    echo ""
+    echo "=========================================="
+}
+
 # Cleanup function
 cleanup() {
+    if [ "$CI" = true ]; then
+        return
+    fi
     # Show container logs if tests failed
     if [ -n "${TEST_EXIT_CODE:-}" ] && [ "$TEST_EXIT_CODE" -ne 0 ]; then
         echo ""
         echo "=========================================="
         echo "CONTAINER LOGS (Test Failed)"
         echo "=========================================="
 
-        echo ""
-        echo "ROCKET.CHAT (rc1) LOGS:"
-        echo "----------------------------------------"
-        if docker ps -q -f name=rc1 | grep -q .; then
-            docker logs rc1 2>&1 | sed 's/^/  /'
-        else
-            echo "  Rocket.Chat container not found or no logs"
-        fi
-
-        echo ""
-        echo "SYNAPSE (hs1) LOGS:"
-        echo "----------------------------------------"
-        if docker ps -q -f name=hs1 | grep -q .; then
-            docker logs hs1 2>&1 | sed 's/^/  /'
-        else
-            echo "  Synapse container not found or no logs"
-        fi
-
-        echo ""
-        echo "=========================================="
+        docker_logs
     fi
 
     if [ "$KEEP_RUNNING" = true ]; then
@@ -333,6 +359,9 @@ if [ "$NO_TEST" = false ]; then
     IS_EE=true NODE_EXTRA_CA_CERTS=$(pwd)/docker-compose/traefik/certs/ca/rootCA.crt yarn test:federation
     TEST_EXIT_CODE=$?
     set -e
+elif [ "$LOGS" = true ]; then
+    docker_logs
+    exit 0
 else
     log_info "No-test mode: skipping test execution"
     log_info "Services are ready and running. You can now:"