Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -3,7 +3,6 @@ image: 41abku1mst/moodle-web:latest  # your Moodle image in registry
 stages:
   - full_test
 
-# GitLab services: MariaDB + Backend
 services:
   - name: mariadb:10.6
     alias: db
@@ -23,34 +22,57 @@ variables:
   MARIADB_USER: moodleuser
   MARIADB_PASSWORD: moodlepassword
 
-  # Backend port (internal GitLab service network)
+  # Backend URL
   BACKEND_URL: "http://backend:8080"
 
 run_full_automation:
   stage: full_test
   script:
-    # 1. Start Apache in background
+    # 1. Install curl + netcat if missing
+    - apt-get update && apt-get install -y curl netcat
+
+    # 2. Start Apache in background
     - echo "🚀 Starting Apache..."
     - apache2ctl -D FOREGROUND &
     - sleep 10
 
-    # 2. Wait for MariaDB service
+    # 3. Wait for MariaDB
     - echo "⏳ Waiting for MariaDB..."
+    - timeout=180
     - until mysqladmin ping -h"db" --silent; do
+        timeout=$((timeout - 5));
+        if [ $timeout -le 0 ]; then
+          echo "❌ MariaDB did not start after 3 minutes.";
+          exit 1;
+        fi;
         echo " -> DB not ready, retrying in 5s";
         sleep 5;
       done
     - echo "✅ MariaDB is ready."
 
-    # 3. Wait for backend
-    - echo "⏳ Waiting for backend..."
-    - until curl -s -f -o /dev/null http://backend:8080/actuator/health; do
+    # 4. Wait for backend TCP port
+    - echo "⏳ Waiting for backend:8080..."
+    - timeout=180
+    - until nc -z backend 8080; do
+        timeout=$((timeout - 5));
+        if [ $timeout -le 0 ]; then
+          echo "❌ Backend port 8080 not reachable after 3 minutes.";
+          exit 1;
+        fi;
         echo " -> Backend not ready, retrying in 5s";
         sleep 5;
       done
-    - echo "✅ Backend is ready."
+    - echo "✅ Backend port is open."
+
+    # 5. Try /actuator/health if available (non-blocking)
+    - echo "⏳ Checking backend health endpoint..."
+    - if curl -s -f $BACKEND_URL/actuator/health > /dev/null; then
+        echo "✅ Backend health endpoint OK";
+      else
+        echo "⚠️ Backend health endpoint not available, continuing anyway";
+      fi
 
-    # 4. Run Moodle + Backend orchestration
-    - echo "▶️ Running full Moodle automation..."
+    # 6. Run Moodle orchestration
+    - echo "▶️ Running Moodle automation..."
     - chmod +x test-moodle.sh
     - ./test-moodle.sh