diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8f08db4ffec142a7ae42521c77a703ac60fa1ac..5b054c1182d3f0da784f6c647c292be6072840b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ composer: - docker pull $TEST_IMAGE - docker network ls -f name=rekall || docker network create rekall - docker ps -a -f name=mysql | grep mysql && docker rm mysql || true - - docker ps -a -f name=rekall | grep mysql && docker rm rekall || true + - docker ps -a -f name=rekall | grep rekall && docker rm rekall || true rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web"' - if: '$CI_COMMIT_MESSAGE =~ /test/' diff --git a/tools/ci-job.sh b/tools/ci-job.sh index d82fb53ec2a44acbf78ad4e43857374fb51fe0fc..50ce585cc040178c9a6df746d8d4adcc8aac3171 100755 --- a/tools/ci-job.sh +++ b/tools/ci-job.sh @@ -30,8 +30,10 @@ echo "Waiting for mysql to be up and running" until nc -z -v -w30 mysql 3306; do sleep 5 done -run_step "Doctrine create DB" php bin/console doctrine:migrations:migrate --env=test -run_step "Doctrine load fixtures" php bin/console doctrine:fixtures:load --no-interaction --env=test +echo "Doctrine create DB" +php bin/console doctrine:migrations:migrate --no-interaction --env=test +echo "Doctrine load fixtures" +php bin/console doctrine:fixtures:load --no-interaction --env=test run_step "Unit and functional tests" composer tests run_step "Php Code Sniffer" composer phpcs run_step "Php Static analysis" composer phpstan