diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 334062392ea3d03e8e5fd306eb2fbaaa6410fc51..89632f50371ab331ff14b8f136673a81ef6b8acf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: GCP_TAG_REGEX: "^gcp-r[0-9]+_[0-9]+" # TESTS_BRANCH_REGEX: "^master" # only run tests for branches in the main repository - TESTS_PROJECT_NAME: "cspp_geo/geosphere/geosphere-deploy" + TESTS_PROJECT_NAMESPACE: "cspp_geo/geosphere/geosphere-deploy" GEOSPHERE_NAMESPACE: "geosphere" GEOSPHERE_TEST_NAMESPACE: "geosphere-test" GCP_NAMESPACE: "default" diff --git a/helpers/get_namespace.sh b/helpers/get_namespace.sh index 9a9acc9c967c673fd60726159f1a5cf32af7cae3..c9858144323b26897f72bc453c363228a31f1adc 100755 --- a/helpers/get_namespace.sh +++ b/helpers/get_namespace.sh @@ -24,11 +24,11 @@ if [[ -n "$CI_COMMIT_TAG" ]]; then debug "gcp tag matched" ns="${GCP_NAMESPACE}" fi -elif [[ $CI_PROJECT_NAME =~ $TESTS_PROJECT_NAME ]]; then - debug "Tests project name matched" +elif [[ $CI_PROJECT_NAMESPACE =~ $TESTS_PROJECT_NAMESPACE ]]; then + debug "Tests project namespace matched" ns="${TESTS_NAMESPACE}" else - debug "Could not determine namespace | $CI_COMMIT_TAG | $CI_PROJECT_NAME" + debug "Could not determine namespace | $CI_COMMIT_TAG | $CI_PROJECT_NAMESPACE" fi if [[ -z $ns ]]; then