FIX: Remove f-grpc branch names

.gitlab-ci.yml

@@ -37,8 +37,8 @@ variables:
 
   # This is the caosdb-deploy branch which build the images for caosdb-server and caosdb-mysql
   # TODO change to dev after merge of f-grpc to dev
-  DEPLOY_REF: f-grpc
-  DEFAULT_CAOSDB_TAG: f-grpc
+  DEPLOY_REF: dev
+  DEFAULT_CAOSDB_TAG: dev
 
   # The defalt branch to use with caosdb-cpplib
   # TODO: Change back to dev once f-consolidate-c has been merged
@@ -146,11 +146,13 @@ test:
     - if [[ "$CAOSDB_TAG" == "" ]]; then
         if echo "$F_BRANCH" | grep -c "^f-" ; then
           CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
-          docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
+          docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
         elif [ "$F_BRANCH" == "main" ] ; then
-          CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_main ;
+          CAOSDB_TAG=main ;
+        elif [ "$F_BRANCH" == "dev" ] ; then
+          CAOSDB_TAG=dev ;
         else
-          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
+          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
         fi;
       fi
     # Set the F_BRANCH variable to the current branch name if it