From 52081b0534bc2f991ae61facdfcb91f3dc5932cd Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Thu, 19 Aug 2021 16:24:22 +0200
Subject: [PATCH] FIX: Trigger Int Tests in dev if there is no matching f
branch
---
.gitlab-ci.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a54a23c..d81b6e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
--
GitLab