Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geosphere-deploy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cspp_geo
geosphere
geosphere-deploy
Commits
92b6a470
Verified
Commit
92b6a470
authored
4 years ago
by
David Hoese
Browse files
Options
Downloads
Patches
Plain Diff
Try to allow tests to run in any branch on the main repos
parent
b7ad403c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+3
-1
3 additions, 1 deletion
.gitlab-ci.yml
helpers/get_namespace.sh
+1
-1
1 addition, 1 deletion
helpers/get_namespace.sh
with
4 additions
and
2 deletions
.gitlab-ci.yml
+
3
−
1
View file @
92b6a470
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
helpers/get_namespace.sh
+
1
−
1
View file @
92b6a470
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment