diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef29be9d551ebaec233b7fc8a1e4f8255822a302..8027befbc7deb93168a888f7c3354685eb661f81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,8 +130,6 @@ test: script: - *env - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - time docker load < /image-cache/caosdb-${CAOSDB_TAG}.tar || time docker load < /image-cache/caosdb-dev.tar || true - - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev - F_BRANCH=${F_BRANCH:-$CI_COMMIT_REF_NAME} - echo "F_BRANCH = $F_BRANCH" @@ -149,6 +147,8 @@ test: fi - echo "CAOSDB_TAG = $CAOSDB_TAG" + - time docker load < /image-cache/caosdb-${CAOSDB_TAG}.tar || time docker load < /image-cache/caosdb-dev.tar || true + - 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 - docker load < /image-cache/mariadb.tar || true