Skip to content
Snippets Groups Projects
Verified Commit a2ca1ccc authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' of gitlab.indiscale.com:caosdb/src/caosdb-pyinttest into dev

parents 46454190 fad8cfaa
No related branches found
No related tags found
No related merge requests found
Pipeline #18926 failed
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment