From 60422be1d69f5332733411c45fd1445ffaaa8f45 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 10 Dec 2021 10:38:36 +0100
Subject: [PATCH] PIPELINE: update pipeline
---
.gitlab-ci.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 142ef86..b885dc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,18 +125,20 @@ 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
- 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}_F_dev ;
+ - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
- echo "CAOSDB_TAG = $CAOSDB_TAG"
- docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true
--
GitLab