From 943ed6c200d64b93474b55ca7baeda8d65fb6ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 6 Apr 2022 09:31:54 +0200
Subject: [PATCH] MAINT: added comments and minor clean up to .gitlab-ci.yml
---
.gitlab-ci.yml | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7981456..5d821d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,6 @@ test:
image: $CI_REGISTRY_IMAGE_BASE
needs: ["cert"]
script:
- - ls /
- echo $F_BRANCH
- echo $CAOSDB_TAG
- echo $CI_COMMIT_REF_NAME
@@ -112,7 +111,6 @@ test:
- echo $CI_REGISTRY_IMAGE
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
- if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then
CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
@@ -121,30 +119,47 @@ test:
CAOSDB_TAG=${DEPLOY_REF};
fi;
fi
- - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev ;
- echo $CAOSDB_TAG
+ - cd .docker
+ # Store mariadb version
+ - MARIADBVERSION=$(grep mariadb docker-compose.yml | awk '{print $2}')
+ - echo "mariadb image:"$MARIADBVERSION
- time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true
- - time docker load < /image-cache/mariadb.tar || true
+ - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
+ - time docker load < /image-cache/$MARIADBVERSION.tar || true
- docker pull $CI_REGISTRY_IMAGE
- - cd .docker
- # here the server and the mysql backend docker are being started
+ - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev ;
+
+ # Here, the server and the mysql backend docker are being started
- 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_pylib_commit > hash_pylib
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit > hash_server
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql
- # the pyinttest docker writes the return value of the tests into the
- # file result
+
+ # Run the actual tests. This starts a new docker container within which
+ # the tests run. The return value is stored in .docker/result
- /bin/sh ./run.sh
+
+ # Save logs
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt
- cd ..
+
+ # Stop the server
- docker-compose -f .docker/docker-compose.yml down
+
+ # Store mariadb image
+ - if [ ! -f ".gistlab-ci.yml" ]; then
+ time docker save $MARIADBVERSION > /image-cache/$MARIADBVERSION.tar || true
+ fi
+
+ # the pyinttest docker writes the return value of the tests into the
+ # file result
- rc=`cat .docker/result`
- - echo mariadb:$(docker image ls mariadb | grep mariadb | awk '{print $2}')
- - docker save mariadb:$(docker image ls mariadb | grep mariadb | awk '{print $2}') > /image-cache/mariadb.tar || true
- exit $rc
dependencies: [cert]
timeout: 3h
--
GitLab