Resolve merge conflicts in CI/CD workflow - Clean up test job structure and remove duplicate steps

Author: Zahed-Riyaz

.github/workflows/ci-cd.yml

@@ -70,7 +70,6 @@ jobs:
   build-and-push:
     name: Build & Push Docker Images
     runs-on: ubuntu-latest
-    # REMOVED: No dependencies - runs in parallel
     outputs:
       image-digest: ${{ steps.build.outputs.digest }}
     steps:
@@ -114,7 +113,6 @@ jobs:
   test:
     name: Run Tests
     runs-on: ubuntu-latest
-    # REMOVED: No dependencies - runs in parallel with build
     strategy:
       matrix:
         test-type: [frontend, backend]
@@ -153,17 +151,6 @@ jobs:
         if: matrix.test-type == 'frontend'
         run: |
           docker compose run nodejs bash -c "gulp dev && karma start --single-run && gulp staging"
-          sudo curl -L "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
-      
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.9.21
-
-      - name: Install dependencies
-        run: pip install awscli==1.18.66
 
       - name: Run backend tests
         if: matrix.test-type == 'backend'
@@ -182,15 +169,15 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: |
-          echo "Submitting coverage to Coveralls..."
+          echo "Attempting to submit coverage to Coveralls..."
           docker-compose run -e DJANGO_SETTINGS_MODULE=settings.test -e COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }} django bash -c "
           pip install coveralls &&
           coveralls --rcfile=.coveragerc" || echo "Coveralls submission failed, but continuing workflow"
-                   
+
   deploy:
     name: Package & Deploy Services
     runs-on: ubuntu-latest
-    needs: [build-and-push, test, quality-check]  # Waits for ALL jobs to complete
+    needs: [build-and-push, test, quality-check]
     if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
     environment: production
     steps: