From fbb870cc3c531e434e683140dda3e2faa983ae96 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 9 Jun 2021 15:01:27 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c1425..e4fbbe4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,13 +139,13 @@ test:
- if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then
- CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
- docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ;
+ CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
+ docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF} ;
else
- CAOSDB_TAG=${DEPLOY_REF}-latest;
+ CAOSDB_TAG=${DEPLOY_REF};
fi;
fi
- - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev-latest ;
+ - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev ;
- docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true
- docker pull $CPPINTTEST_REGISTRY_IMAGE
--
GitLab