diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 0ce75f43a8e21a6531126c643edfb955c116bd83..905cf5e36384fb1ac2a0b2cd200c252f0f8440c8 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -5,6 +5,7 @@ RUN apt-get update && \ python3-pip \ tox \ git \ + openjdk-17-jdk-headless \ -y @@ -17,7 +18,7 @@ RUN pip install --break-system-packages -U git+https://gitlab.indiscale.com/caos # RUN pip install -U html2text pycodestyle pylint recommonmark sphinx-rtd-theme gitignore-parser COPY . /git RUN rm -r /git/.git \ - && mv /git/.docker/pycaosdb.ini /git/integrationtests + && mv /git/.docker/pylinkahead.ini /git/integrationtests RUN cd /git && pip install --break-system-packages -U .[all] WORKDIR /git/integrationtests -CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force +CMD /wait-for-it.sh docker-linkahead-server-1:10443 -t 300 --strict -- ./test.sh --force diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 36964ee68b7e384267a08484524de1f72cdfad6d..61d455f43ec92974207ba0ae8aadf528e15dfcaa 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -1,12 +1,12 @@ version: '3.7' services: sqldb: - image: mariadb:10.4 + image: mariadb:10.11 environment: MYSQL_ROOT_PASSWORD: caosdb1234 networks: - caosnet - caosdb-server: + linkahead-server: image: "$CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG" user: 999:999 depends_on: diff --git a/.docker/local_testing.sh b/.docker/local_testing.sh index bdecf73be670775b3b888846e77d261f22e552df..bbe7d8af408cc40758d48c49119d3ba4db5d0325 100755 --- a/.docker/local_testing.sh +++ b/.docker/local_testing.sh @@ -10,7 +10,7 @@ CI_REGISTRY_IMAGE=registry.indiscale.com/caosdb-advanced-testenv \ CI_REGISTRY=registry.indiscale.com EXEPATH=`pwd` CAOSDB_TAG=dev-latest \ docker-compose -f .docker/docker-compose.yml up -d cd .docker -CAOSHOSTNAME=caosdb-server ./cert.sh +CAOSHOSTNAME=linkahead-server ./cert.sh CI_REGISTRY_IMAGE=registry.indiscale.com/caosdb-advanced-testenv ./run.sh docker-compose down diff --git a/.docker/pycaosdb.ini b/.docker/pylinkahead.ini similarity index 88% rename from .docker/pycaosdb.ini rename to .docker/pylinkahead.ini index 652d536916ad0a4acece723a966eb310a045dd1a..bfa5705b56c31809567b69341470dd065ab3ed74 100644 --- a/.docker/pycaosdb.ini +++ b/.docker/pylinkahead.ini @@ -2,7 +2,7 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/ [Connection] -url=https://caosdb-server:10443 +url=https://linkahead-server:10443 username=admin cacert=/opt/caosdb/cert/caosdb.cert.pem debug=0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2c7f75b3fd17a287e3a879d1c53a610c174e204..5f9d7fe458fe147c016e989659ed1bb15fd517e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ test: - cd .docker - /bin/sh ./run.sh - cd .. - - docker logs docker-caosdb-server-1 &> caosdb_log.txt + - docker logs docker-linkahead-server-1 &> caosdb_log.txt - docker logs docker-sqldb-1 &> mariadb_log.txt - docker-compose -f .docker/docker-compose.yml down - rc=`cat .docker/result` diff --git a/integrationtests/test.sh b/integrationtests/test.sh index a31afcfd2f74770b656eef41002b2f444b7962de..952a4dd20c4944c0106cb3450ca2ef3e609d79be 100755 --- a/integrationtests/test.sh +++ b/integrationtests/test.sh @@ -15,7 +15,7 @@ then fi OUT=/tmp/crawler.output ls -cat pycaosdb.ini +cat pylinkahead.ini python3 -c "import linkahead; print('LinkAhead Version:', linkahead.__version__)" rm -rf /tmp/caosdb_identifiable_cache.db set -e