FIX: registry use

.docker/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     networks:
       - caosnet
   caosdb-server:
-    image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG"
+    image: "$CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG"
     user: 999:999
     depends_on:
       - sqldb

.gitlab-ci.yml

@@ -19,7 +19,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 variables:
-   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pyint-testenv
+   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-pyinttest/testenv
 
 stages:
   - setup
@@ -92,7 +92,7 @@ test:
       - time docker load < /image-cache/caosdb-pyint-testenv.tar || true
       - time docker load < /image-cache/mariadb.tar || true
       - time docker load < /image-cache/caosdb.tar || true
-      - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+      - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
       - docker pull $CI_REGISTRY_IMAGE:latest
       - cd .docker
         # here the server and the mysql backend docker are being started
@@ -103,6 +103,7 @@ 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