From 8ec6ced8dce9fe78ca1c6e98e1aa8fe743dbbfb7 Mon Sep 17 00:00:00 2001
From: Peter Nied <peternied@hotmail.com>
Date: Tue, 18 Jun 2024 19:40:04 +0000
Subject: [PATCH] Troubleshooting setup failures

Signed-off-by: Peter Nied <peternied@hotmail.com>
---
 .github/workflows/CI.yml      | 12 +++++--
 .github/workflows/e2eTest.yml | 67 -----------------------------------
 2 files changed, 10 insertions(+), 69 deletions(-)
 delete mode 100644 .github/workflows/e2eTest.yml

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d35793853..0d7cb02ec 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -38,6 +38,8 @@ jobs:
       run:
         working-directory: ./TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link
     steps:
+      - run: pwd
+      - run: ls -al
       - name: Install Dependencies for Console Library and Tests
         run: |
           python -m pip install . -r ./tests/requirements.txt
@@ -67,6 +69,13 @@ jobs:
           java-version: '11'
           distribution: 'corretto'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: 8.0.2
+          gradle-home-cache-cleanup: true
+          cache-read-only: false
+
       - name: Generate Cache Key from Dockerfiles
         id: generate_cache_key
         run: |
@@ -122,8 +131,7 @@ jobs:
           key: docker-${{ runner.os }}-${{ needs.setup-gradle.outputs.docker-cache-key }}
 
       - name: Start Docker Solution
-        run: ../gradlew dockerSolution:ComposeUp -x test --scan --info --stacktrace
-        working-directory: TrafficCapture
+        run: ./gradlew -p TrafficCapture dockerSolution:ComposeUp -x test --scan --info --stacktrace
         env:
           OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
 
diff --git a/.github/workflows/e2eTest.yml b/.github/workflows/e2eTest.yml
deleted file mode 100644
index 5fdd27680..000000000
--- a/.github/workflows/e2eTest.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: E2E Testing
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'corretto'
-
-      - name: Generate Cache Key from Dockerfiles
-        id: generate_cache_key
-        run: |
-          files=$(find . -type f \( -name 'docker-compose.yml' -o -name 'Dockerfile' \))
-          file_contents=$(cat $files)
-          key=$(echo "${file_contents}" | sha1sum | awk '{print $1}')
-          echo "key=${key}" >> "$GITHUB_OUTPUT"
-
-      - name: Cache Docker Images
-        uses: ScribeMD/docker-cache@0.5.0
-        with:
-          key: docker-${{ runner.os }}-${{ steps.generate_cache_key.outputs.key }}
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: 8.0.2
-          gradle-home-cache-cleanup: true
-          cache-read-only: false
-
-      - name: Start Docker Solution
-        run: ../gradlew dockerSolution:ComposeUp -x test --scan --info --stacktrace
-        working-directory: TrafficCapture
-        env:
-          OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-
-      - name: Install dependencies
-        run: |
-          cd test
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt 
-
-
-      - name: Run E2E test script
-        run: |
-          cd test
-          chmod +x ./tests.py
-          pytest tests.py --unique_id="testindex"