diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42cc84fcc44..e41bdeaad0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ docker_build_source_reuse: variables: REUSE_IMAGES: "true" rules: - - if: &TESTS_NEEDING_BUILT_IMAGE $RUN_ALL_TESTS == "true" || $PHP_UNIT_ALL_TESTS_BUILT == "true" || $PHP_UNIT_NOGITLABCI_TESTS_BUILT == "true" || $PHP_UNIT_ALL_TESTS_BUILT_WITH_LDAP == "true" + - if: &TESTS_NEEDING_BUILT_IMAGE $RUN_ALL_TESTS == "true" || $PHP_UNIT_ALL_TESTS_BUILT == "true" || $PHP_UNIT_NOGITLABCI_TESTS_BUILT == "true" || $PHP_UNIT_ALL_TESTS_BUILT_WITH_LDAP == "true" || $TEST_WITH_HEALTH_CHECK == "true" when: never - if: &DEPLOYS_NEEDING_BUILT_IMAGE $PUSH_BUILT_IMAGE_TO_GITLAB == "true" when: never @@ -262,14 +262,12 @@ docker_build_dev: variables: ARG_IMAGE: test-built-commit stage: test - needs: - - docker_build_build_built_test-built timeout: 20m script: - sleep 120s - curl -v --fail http://127.0.0.1:80/health rules: - - if: $DOCKER_BUILD_BUILD != "true" + - if: $TEST_WITH_HEALTH_CHECK == "never" when: never - if: $RUN_ALL_TESTS == "true" when: on_success diff --git a/ci/ci-config.yml b/ci/ci-config.yml index 106b9d6906a..48a990b687c 100644 --- a/ci/ci-config.yml +++ b/ci/ci-config.yml @@ -79,7 +79,7 @@ variables: PHPUNIT_FILTER: "" # test if tine20 /health api dose not return a 500 - TEST_WITH_HEALTH_CHECK: "true" + TEST_WITH_HEALTH_CHECK: "false" # Run all tests, test failures are ignored, dose not allow push RUN_ALL_TESTS: "false"