Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-cpplib
Commits
52081b05
Commit
52081b05
authored
3 years ago
by
florian
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Trigger Int Tests in dev if there is no matching f branch
parent
91220699
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!14
ENH: New functions getEnumNameFromValue() and getEnumValueFromName()
,
!12
F consolidation
Pipeline
#12267
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12269
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+8
-2
8 additions, 2 deletions
.gitlab-ci.yml
with
8 additions
and
2 deletions
.gitlab-ci.yml
+
8
−
2
View file @
52081b05
...
...
@@ -24,6 +24,7 @@ variables:
CPPLIB_REGISTRY_IMAGE
:
$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
CPPINTTEST_PIPELINE
:
https://gitlab.indiscale.com/api/v4/projects/111/trigger/pipeline
CPPINTTEST_BRANCHES
:
https://gitlab.indiscale.com/api/v4/projects/111/repository/branches
GIT_SUBMODULE_STRATEGY
:
normal
## FOR DEBUGGING
...
...
@@ -101,8 +102,13 @@ trigger_inttest:
# ... use an f-branch if posible...
-
F_BRANCH=dev
-
if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then
CPPINT_REF=$CI_COMMIT_REF_NAME ;
F_BRANCH=$CI_COMMIT_REF_NAME ;
if curl -o /dev/null -s -w "%{http_code}" $CPPINTTEST_BRANCHES/$CI_COMMIT_REF_NAME | grep "404"; then
CPPINT_REF=dev ;
F_BRANCH=dev ;
else
CPPINT_REF=$CI_COMMIT_REF_NAME ;
F_BRANCH=$CI_COMMIT_REF_NAME ;
fi
fi;
# ... or use main if possible...
-
if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then
...
...
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