From 001d5ebddebb35b2668a21de590b700bf2400e2d Mon Sep 17 00:00:00 2001 From: Atanas Atanasov Date: Mon, 7 Oct 2024 13:48:38 +0300 Subject: [PATCH] some fixes, adding a step to stop the container, removing app.logs check since relies on gradle Signed-off-by: Atanas Atanasov --- .github/workflows/smoke-test.yaml | 11 ++++++----- server/build.gradle.kts | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml index 23a1b36a..89fa5755 100644 --- a/.github/workflows/smoke-test.yaml +++ b/.github/workflows/smoke-test.yaml @@ -80,13 +80,14 @@ jobs: run: ${{ env.GRADLE_EXEC }} clean :server:build -x test - name: Create and Run Smoke Test Container - run: ${{ env.GRADLE_EXEC }} runSmokeTests 2> server/src/test/resources/app.log < /dev/null & + run: ${{ env.GRADLE_EXEC }} runSmokeTests & echo "Application started with PID $APP_PID" sleep 10 - - name: Print App Logs - run: cat server/src/test/resources/app.log - - name: Smoke Test working-directory: server/src/test/resources/ - run: ./smoke-test.sh app.log + run: ./smoke-test.sh + + # TODO do we need to stop this container? In theory when the job runs, everything gets scrapped + - name: Stop Docker Container + run: ${{ env.GRADLE_EXEC }} stopDockerContainer \ No newline at end of file diff --git a/server/build.gradle.kts b/server/build.gradle.kts index b6585257..4c379f4e 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -141,6 +141,11 @@ tasks.register("runSmokeTests") { project.version, layout.projectDirectory.dir("..").asFile ) + commandLine( + "sh", + "-c", + "docker compose -p block-node up -d" + ) } println("Build completed using src/test/resources/app.properties") }