diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b1c87a8fdb58174739a552775e754be1965f96c..33312d11be1f95bb9b968e688b60133ad83921b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,6 @@ test: CAOSDB_TAG=dev-latest; fi - echo $CAOSDB_TAG - - docker login -u gitlab+deploy-token-ci-pull -p $TOKEN_CI_PULL $CI_REGISTRY_INDISCALE #- KNOWN_TAGS=$(curl -u gitlab+deploy-token-ci-pull:$TOKEN_CI_PULL -X GET https://$CI_REGISTRY_INDISCALE/v2/caosdb/src/caosdb-deploy/tags/list) # - echo $KNOWN_TAGS # test if the caosdb registry knows our current tag @@ -95,6 +94,7 @@ test: - time docker load < /image-cache/mariadb.tar || true - time docker load < /image-cache/caosdb.tar || true - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u gitlab+deploy-token-ci-pull -p $TOKEN_CI_PULL $CI_REGISTRY_INDISCALE - docker pull $CI_REGISTRY_IMAGE - cd .docker # here the server and the mysql backend docker are being started @@ -105,7 +105,6 @@ test: - cd .. - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - docker logs docker_sqldb_1 &> ../mariadb_log.txt - - docker login -u $INDISCALE_USER -p $INDISCALE_TOKEN $CI_REGISTRY_INDISCALE - docker-compose -f .docker/docker-compose.yml down - rc=`cat .docker/result` - exit $rc