Skip to content
Snippets Groups Projects
Verified Commit 3546a063 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Next attempt at fixing the pipeline.

parent 9db184e5
No related branches found
No related tags found
No related merge requests found
Pipeline #18905 passed
...@@ -121,7 +121,7 @@ test: ...@@ -121,7 +121,7 @@ test:
- echo "CAOSDB_TAG = $CAOSDB_TAG" - echo "CAOSDB_TAG = $CAOSDB_TAG"
- echo "DEPLOY_REF = $DEPLOY_REF" - echo "DEPLOY_REF = $DEPLOY_REF"
- docker load < /image-cache/caosdb-${F_BRANCH}.tar || true - docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_dev ; - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev ;
- echo "CAOSDB_TAG = $CAOSDB_TAG" - echo "CAOSDB_TAG = $CAOSDB_TAG"
- docker load < /image-cache/${OCTAVEINTTEST_IMAGE_CACHE} || true - docker load < /image-cache/${OCTAVEINTTEST_IMAGE_CACHE} || true
...@@ -134,7 +134,7 @@ test: ...@@ -134,7 +134,7 @@ test:
- ls -la cert - ls -la cert
# here the server and the mysql backend docker are being started # here the server and the mysql backend docker are being started
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d - CAOSDB_TAG="$CAOSDB_TAG" docker-compose up -d
# store versions of CaosDB parts # store versions of CaosDB parts
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment