From fad8cfaaed0e896ab4caee63deafce3fa0bb64ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 29 Nov 2021 10:35:13 +0100
Subject: [PATCH] MAINT: fix image names
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b89cff..7981456 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,13 +115,13 @@ test:
- time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- 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 ;
- echo $CAOSDB_TAG
- time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true
--
GitLab