From 9db2878b19b39e404e0f40543b5f51fc2d86a440 Mon Sep 17 00:00:00 2001 From: Jonathan Lelievre Date: Thu, 14 Sep 2023 02:00:07 +0200 Subject: [PATCH] No keycloak service in sanity and in test that are not API --- .github/workflows/test-sanity.yml | 2 +- .github/workflows/test-with-prebuilt-shop.yml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml index f6613866..0a7b9461 100644 --- a/.github/workflows/test-sanity.yml +++ b/.github/workflows/test-sanity.yml @@ -142,7 +142,7 @@ jobs: PS_INSTALL_AUTO: 0 run: | echo Build docker via docker composer - USER_ID=$(id -u) GROUP_ID=$(id -g) docker-compose -f docker-compose.yml up -d --build + USER_ID=$(id -u) GROUP_ID=$(id -g) docker-compose -f docker-compose.yml up -d --build prestashop-git - name: Start sanity campaign uses: ./custom_actions/.github/workflows/actions/run-tests diff --git a/.github/workflows/test-with-prebuilt-shop.yml b/.github/workflows/test-with-prebuilt-shop.yml index d89590ce..5a86c24e 100644 --- a/.github/workflows/test-with-prebuilt-shop.yml +++ b/.github/workflows/test-with-prebuilt-shop.yml @@ -93,6 +93,14 @@ jobs: ## Add self-signed certificate to Chrome Trust Store mkcert -install + - name: Start keycloak service + if: inputs.test_command == 'functional:API' + working-directory: ${{ env.PS_DIR }} + timeout-minutes: 5 + run: | + echo Starting keycloak service alone + USER_ID=$(id -u) GROUP_ID=$(id -g) docker-compose -f docker-compose.yml up -d --build keycloak + - name: Setup database working-directory: ${{ env.PS_DIR }} timeout-minutes: 5 @@ -120,7 +128,7 @@ jobs: DISABLE_MAKE: 1 run: | echo Build the remaining dockers - USER_ID=$(id -u) GROUP_ID=$(id -g) docker-compose -f docker-compose.yml up -d --build + USER_ID=$(id -u) GROUP_ID=$(id -g) docker-compose -f docker-compose.yml up -d --build prestashop-git echo Waiting for response from the FO bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} ${{ env.URL_FO }}en/)" != "200" ]]; do sleep 5; done'