From b0d4a5d4c98c659ca9564f964d0a7d01b06914df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 12 Nov 2020 18:01:34 +0100
Subject: [PATCH] pipeline fix
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 396a29b..982ae95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,12 +103,13 @@ test:
- echo $CI_REGISTRY_IMAGE
- docker login -u gitlab+deploy-token-ci-pull -p $TOKEN_CI_PULL $CI_REGISTRY_INDISCALE
- - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then
+ time docker load < /image-cache/caosdb-${DEPLOY_REF}_F_${F_BRANCH}.tar || true
CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
docker pull $CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ;
else
+ time docker load < /image-cache/caosdb-${DEPLOY_REF}.tar || true
CAOSDB_TAG=${DEPLOY_REF}-latest;
fi;
fi
--
GitLab