Merge branch 'f-query' of gitlab.indiscale.com:caosdb/src/caosdb-cpplib into f-query

.gitlab-ci.yml

@@ -50,6 +50,7 @@ info:
     - echo "$CPPLIB_REGISTRY_IMAGE"
     - echo "$CPPINTTEST_PIPELINE"
     - echo "$GIT_SUBMODULE_STRATEGY"
+    - echo "$CI_COMMIT_REF_NAME"
 
 # Build a docker image in which tests for this repository can run
 build-testenv:
@@ -98,16 +99,21 @@ trigger_inttest:
 
     ## Determine the cppinttest branch...
     # ... 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 ;
       fi;
     # ... or use main if possible...
     - if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then
         CPPINT_REF=main ;
       fi
+    - if echo "$CI_COMMIT_REF_NAME" | grep -c "^v" ; then
+        CPPINT_REF=main ;
+        F_BRANCH=main ;
+      fi
     # ... and fall-back to dev
     - CPPINT_REF=${CPPINT_REF:-dev}
-    - F_BRANCH=$CI_COMMIT_REF_NAME
 
     - echo "Triggering caosdb-cppinttest@${CPPINT_REF} (F_BRANCH=$F_BRANCH)"
     - curl -w "%{stderr}HTTPCODE=%{http_code}" -X POST