FIX: Pipeline (also some LinkAhead renaming)

.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

.docker/docker-compose.yml

 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:

.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
 

.docker/pycaosdb.ini → .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

.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`

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