diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a54a23c5ad43ef851afeea2e31351a00ec2cadcc..d81b6e4ad2475604755798318be85371cd21484a 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