Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Commit

Permalink
fix(ci) test with healtcheck yaml
Browse files Browse the repository at this point in the history
Change-Id: Id967edcf9fa69429f233af844e262a56d763c4d1
Reviewed-on: http://gerrit.tine20.com/customers/18603
Reviewed-by: Milan Mertens <m.mertens@metaways.de>
Tested-by: Milan Mertens <m.mertens@metaways.de>
  • Loading branch information
byteplow committed Dec 1, 2020
1 parent f9d9dfc commit b85d341
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions .gitlab-ci.yml
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/ci-config.yml
Expand Up @@ -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"

0 comments on commit b85d341

Please sign in to comment.