From 92b6a4709af3963774c46dd01be0fabadb1f4b3c Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 10 Nov 2020 09:08:30 -0600
Subject: [PATCH] Try to allow tests to run in any branch on the main repos
---
.gitlab-ci.yml | 4 +++-
helpers/get_namespace.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5efbc3..3340623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,9 @@ variables:
GEOSPHERE_TAG_REGEX: "^r[0-9]+_[0-9]+"
GEOSPHERE_TEST_TAG_REGEX: "^test-r[0-9]+_[0-9]+"
GCP_TAG_REGEX: "^gcp-r[0-9]+_[0-9]+"
- TESTS_BRANCH_REGEX: "^master"
+# TESTS_BRANCH_REGEX: "^master"
+ # only run tests for branches in the main repository
+ TESTS_PROJECT_NAME: "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 696d237..8cb5874 100755
--- a/helpers/get_namespace.sh
+++ b/helpers/get_namespace.sh
@@ -12,7 +12,7 @@ if [[ -n "$CI_COMMIT_TAG" ]]; then
elif [[ $CI_COMMIT_TAG =~ $GCP_TAG_REGEX ]]; then
ns="${GCP_NAMESPACE}";
fi
-elif [[ $CI_COMMIT_BRANCH =~ $TESTS_BRANCH_REGEX ]]; then
+elif [[ $CI_PROJECT_NAME =~ $TESTS_PROJECT_NAME ]]; then
ns="${TESTS_NAMESPACE}";
fi
--
GitLab