Refactor CI workflow for end-to-end tests; streamline steps, enhance readability, and improve health check logic.

Author: YosefKahlon

.github/workflows/ci_week7.yml

@@ -7,66 +7,50 @@ on:
 
 jobs:
   e2e:
-    name: Run Docker Compose End-to-End Tests
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository
+      - name: 📥 Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: 🔧 Build services
+        run: docker compose -f DevOps-Linux/week7/docker-compose.yml build
+        working-directory: .
 
-      - name: Set up Docker cache
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Build Docker containers
-        run: docker compose build
-
-      - name: Run Docker Compose (detached)
-        run: docker compose up -d
+      - name: 🚀 Start containers
+        run: docker compose -f DevOps-Linux/week7/docker-compose.yml up -d
+        working-directory: .
 
-      - name: Wait for services to be healthy
+      - name: 💤 Wait for DB to become healthy
         run: |
-          set -e
           timeout=30
-          echo "Waiting up to $timeout seconds for services to become healthy..."
           for i in $(seq 1 $timeout); do
-            unhealthy=$(docker inspect --format='{{.State.Health.Status}}' $(docker compose ps -q db || true) || echo "unhealthy")
-            if [ "$unhealthy" == "healthy" ]; then
-              echo "DB is healthy."
-              break
-            fi
+            status=$(docker inspect --format='{{.State.Health.Status}}' $(docker compose -f DevOps-Linux/week7/docker-compose.yml ps -q db))
+            echo "DB health: $status"
+            [ "$status" = "healthy" ] && break
             sleep 1
           done
+        working-directory: .
 
-      - name: Run health check and test endpoint
+      - name: 🔍 Test health endpoint
         run: |
-          echo "Testing health endpoint..."
           curl --fail http://localhost:3000/health
-
-          echo "Testing user GET (expecting empty array or success)..."
           curl --fail http://localhost:3000/api/users
+        working-directory: .
 
-      - name: Handle failed services
+      - name: 🧾 Save logs if failed
         if: failure()
-        run: |
-          echo "One or more steps failed. Showing logs..."
-          docker compose logs > full_logs.txt
-          cat full_logs.txt
+        run: docker compose -f DevOps-Linux/week7/docker-compose.yml logs > full_logs.txt
+        working-directory: .
 
-      - name: Upload logs as artifact
+      - name: 📤 Upload logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: docker-compose-logs
           path: full_logs.txt
 
-      - name: Shut down containers
+      - name: 🧹 Tear down
         if: always()
-        run: docker compose down --volumes
+        run: docker compose -f DevOps-Linux/week7/docker-compose.yml down --volumes
+        working-directory: .