Merge branch 'dev' into f-retrieve-simple-entity

.gitlab-ci.yml

@@ -128,9 +128,9 @@ test:
           CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
           docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
         elif [ "$F_BRANCH" == "main" ] ; then
-          CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_main
+          CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_main ;
         else
-          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev";
+          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
         fi;
       fi
     - echo "F_BRANCH = $F_BRANCH"