Skip to content
Snippets Groups Projects
Commit fad8cfaa authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

MAINT: fix image names

parent b96100c6
Branches
Tags
No related merge requests found
Pipeline #17222 passed
Stage: cert
Stage: style
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
.gitlab-ci.yml
+ 4
− 4
View file @ fad8cfaa
...@@ -115,13 +115,13 @@ test: ...@@ -115,13 +115,13 @@ test:
- time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then if echo "$F_BRANCH" | grep -c "^f-" ; then
CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest; CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ; docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF} ;
else else
CAOSDB_TAG=${DEPLOY_REF}-latest; CAOSDB_TAG=${DEPLOY_REF};
fi; fi;
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 - echo $CAOSDB_TAG
- time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true - time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment