Directly using docker compose to run the automated tests

Was incorrectly using the demo-automated-testing.sh. No need to modify the docker compose directories, file names in there. As noted in this comment by Shankari: link: EVerest#62 (comment) > The demo scripts are designed to be "single line demos" that people can run without having to check out any code Signed-off-by: Mahadik, Mukul Chandrakant <[email protected]>
MukuFlash03 · Jul 11, 2024 · 9e74cc2 · 9e74cc2
1 parent 36d7c1a
commit 9e74cc2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -21,10 +21,22 @@ jobs:
  - name: List Docker images
  run: docker images
 
- - name: Run automated test script
+ - name: Run automated tests using docker-compose.automated-tests.yml
  timeout-minutes: 30
  run: |
- bash demo-automated-testing.sh 
+ echo "Running docker compose up..."
+ docker compose --project-name everest-ac-demo \
+ --file "docker-compose.automated-tests.yml" up \
+ --build \
+ --abort-on-container-exit \
+ --exit-code-from manager
+
+ exit_code=$? 
+ echo "Docker-compose up exit code from manager service: $exit_code" 
+
+ echo "Running docker compose down..."
+ docker compose --project-name everest-ac-demo \
+ --file "docker-compose.automated-tests.yml" down
 
  - name: List Docker images
  run: docker images

diff --git a/demo-automated-testing.sh b/demo-automated-testing.sh
@@ -30,18 +30,5 @@ download_demo_file() {
 download_demo_file "${DEMO_COMPOSE_FILE_NAME}"
 download_demo_file .env
 
-echo "Running docker compose up..."
 docker compose --project-name everest-ac-demo \
- --file "${DEMO_COMPOSE_FILE_NAME}" up \
- --build \
- --abort-on-container-exit \
- --exit-code-from manager
-
-exit_code=$? 
-echo "Docker-compose up exit code from manager service: $exit_code" 
-
-echo "Running docker compose down..."
-docker compose --project-name everest-ac-demo \
- --file "${DEMO_COMPOSE_FILE_NAME}" down
-
-exit $exit_code
+ --file "${DEMO_DIR}/${DEMO_COMPOSE_FILE_NAME}" up