WIP: pipeline

.gitlab-ci.yml

@@ -41,7 +41,7 @@ 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_F_f-grpc_C_main_IC_main
+  DEFAULT_CAOSDB_TAG: f-grpc
 
 stages:
   - info
@@ -126,16 +126,18 @@ 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=${DEPLOY_REF} ;
+          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}
         else
-          CAOSDB_TAG=${DEPLOY_REF};
+          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev";
         fi;
       fi
     - echo "F_BRANCH = $F_BRANCH"
     - echo "CAOSDB_TAG = $CAOSDB_TAG"
     - echo "DEPLOY_REF = $DEPLOY_REF"
     - docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
-    - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG} ;
+    - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_dev ;
     - echo "CAOSDB_TAG = $CAOSDB_TAG"
 
     - docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true