diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab87529..63280d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,12 +196,20 @@ test-e2e: script: - export PROFILES="$(printf '%s ' $COMPOSE_PROFILES)" - apk add --no-cache docker-compose + - | + ( + while true; do + docker compose -f compose.yaml $PROFILES logs -f 2>&1 + sleep 1 + done + ) | tee -a compose.log & + - LOGS_PID=$! - | REGISTRY_PREFIX=$CI_REGISTRY_IMAGE \ docker compose -f compose.yaml -f compose.prod.yaml \ - $PROFILES up -d -y --quiet-pull --quiet-build + $PROFILES up -d --quiet-pull --quiet-build 2>&1 | tee compose.log - | - TEST_CONTAINER_ID=$(docker compose $PROFILES ps -q tests -a) + TEST_CONTAINER_ID=$(docker compose -f compose.yaml $PROFILES ps -q tests -a) timeout 600 docker wait $TEST_CONTAINER_ID TEST_EXIT_CODE=$(docker inspect --format "{{.State.ExitCode}}" $TEST_CONTAINER_ID) @@ -211,9 +219,8 @@ test-e2e: echo "Tests failed with exit code $TEST_EXIT_CODE." exit 1 fi - - docker compose $PROFILES logs --no-color > compose.log - | - docker compose -f compose.yaml -f compose.prod.yaml down + docker compose -f compose.yaml -f compose.prod.yaml $PROFILES down artifacts: paths: - ./.cov