From 23ff775710cdcda4f4b392eb05e56f8031f2ccbe Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Thu, 11 May 2023 16:13:09 +0200 Subject: [PATCH] WIP: Rename caosdb -> linkahead --- .gitlab-ci.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a69350b..c65c0719 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. variables: + # TODO rename to linkahead CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-advanced-user-tools/testenv:latest CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-advanced-user-tools/base:latest @@ -45,20 +46,20 @@ test: stage: integrationtest image: $CI_REGISTRY_IMAGE_BASE script: - - if [[ "$CAOSDB_TAG" == "" ]]; then - CAOSDB_TAG=dev; + - if [[ "$LINKAHEAD_TAG" == "" ]]; then + LINKAHEAD_TAG=dev; fi - - echo $CAOSDB_TAG - - time docker load < /image-cache/caosdb-advanced-testenv.tar || true + - echo $LINKAHEAD_TAG + - time docker load < /image-cache/linkahead-advanced-testenv.tar || true - time docker load < /image-cache/mariadb.tar || true - - time docker load < /image-cache/caosdb-dev.tar || true + - time docker load < /image-cache/linkahead-dev.tar || true - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose + - EXEPATH=`pwd` LINKAHEAD_TAG=$LINKAHEAD_TAG docker-compose -f .docker/docker-compose.yml up -d - cd .docker - /bin/sh ./run.sh - cd .. - - docker logs docker-caosdb-server-1 &> caosdb_log.txt + - docker logs docker-linkahead-server-1 &> linkahead_log.txt - docker logs docker-sqldb-1 &> mariadb_log.txt - docker-compose -f .docker/docker-compose.yml down - rc=`cat .docker/result` @@ -67,7 +68,7 @@ test: needs: [cert] artifacts: paths: - - caosdb_log.txt + - linkahead_log.txt - mariadb_log.txt when: on_failure expire_in: 1 week @@ -86,7 +87,7 @@ build-testenv: --file .docker/Dockerfile -t $CI_REGISTRY_IMAGE . - docker push $CI_REGISTRY_IMAGE - - docker save $CI_REGISTRY_IMAGE > /image-cache/caosdb-advanced-testenv.tar + - docker save $CI_REGISTRY_IMAGE > /image-cache/linkahead-advanced-testenv.tar - cd .docker-base - docker build -t $CI_REGISTRY_IMAGE_BASE . @@ -103,7 +104,7 @@ cert: expire_in: 1 week script: - cd .docker - - CAOSHOSTNAME=caosdb-server ./cert.sh + - CAOSHOSTNAME=linkahead-server ./cert.sh style: tags: [docker] @@ -131,18 +132,19 @@ unittest_py39: script: # First verify that system Python actually is 3.9 - python3 -c "import sys; assert sys.version.startswith('3.9')" - - python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)" + - python3 -c "import linkahead; print('Linkahead Version:', linkahead.__version__)" - tox unittest_py37: tags: [docker] stage: unittest image: python:3.7 + # TODO rename to linkahead script: &python_test_script - pip install nose pandas pytest pytest-cov gitignore-parser openpyxl>=3.0.7 xlrd==1.2 h5py - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev - pip install . - - pytest --cov=caosadvancedtools unittests + - pytest --cov=linkaheadadvancedtools unittests unittest_py38: tags: [docker] -- GitLab