From a637f53658f909a30361b54482eb761a113668b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Sun, 1 Mar 2020 12:24:28 +0100
Subject: [PATCH] FIX: auth
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b1c87a..33312d1 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
--
GitLab