diff --git a/ci_tests/gitlab-ci.yaml b/ci_tests/gitlab-ci.yaml index 2ca3be156b97817809e0dcdad368aab281b6f921..0dbc8ce7a80783454dea37f5c3546c14055852a1 100644 --- a/ci_tests/gitlab-ci.yaml +++ b/ci_tests/gitlab-ci.yaml @@ -31,8 +31,7 @@ test_basic_pg: extends: .helm_based_job stage: test script: - # run, but don't care about failure - - ./ci_tests/run_basic_postgres_test.sh || true + - ./ci_tests/run_basic_postgres_test.sh after_script: - ./ci_tests/cleanup_basic_postgres_test.sh dependencies: @@ -42,6 +41,5 @@ test_basic_pg: - get_chart_mapserver - get_chart_mapcache - get_chart_client - allow_failure: true rules: - when: on_success diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh index 704cdba916c2b86d5074c87cc8794b9c85dffe9e..da4aa0d493a2ba89b18c7294ff30d0edc44d62af 100755 --- a/ci_tests/run_basic_grb_test.sh +++ b/ci_tests/run_basic_grb_test.sh @@ -15,7 +15,7 @@ set -e source ci_tests/_tests_common.sh ns=$(./helpers/get_namespace.sh) source ci_tests/get_release_names.sh -install_basic_grb_charts "ci_tests/basic_grb" || error "Failed to install charts" +install_basic_grb_charts "ci_tests/basic_grb" # give kubernetes a bit to create the resources debug "Waiting for Kubernetes to deploy and schedule components..." diff --git a/ci_tests/run_basic_postgres_test.sh b/ci_tests/run_basic_postgres_test.sh index e86d56e23b58d8a060f40a06a39e4286674fcc68..c07b54b4ca59b2443ef606540f2598bb4ce3a530 100755 --- a/ci_tests/run_basic_postgres_test.sh +++ b/ci_tests/run_basic_postgres_test.sh @@ -16,7 +16,7 @@ set -e source ci_tests/_tests_common.sh ns=$(./helpers/get_namespace.sh) source ci_tests/get_release_names.sh -install_basic_postgres_charts "ci_tests/basic_postgres" || error "Failed to install charts" +install_basic_postgres_charts "ci_tests/basic_postgres" # give kubernetes a bit to create the resources debug "Waiting for Kubernetes to deploy and schedule components..."