From 74510469da1c0a7efd25ad30e2faccbaf2525a0d Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Tue, 26 Nov 2024 15:41:27 +0100
Subject: [PATCH] FIX: Pipeline (also some LinkAhead renaming)
---
.docker/Dockerfile | 5 +++--
.docker/docker-compose.yml | 4 ++--
.docker/local_testing.sh | 2 +-
.docker/{pycaosdb.ini => pylinkahead.ini} | 2 +-
.gitlab-ci.yml | 2 +-
integrationtests/test.sh | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
rename .docker/{pycaosdb.ini => pylinkahead.ini} (88%)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 0ce75f43..905cf5e3 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 36964ee6..61d455f4 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 bdecf73b..bbe7d8af 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 652d5369..bfa5705b 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 d2c7f75b..5f9d7fe4 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 a31afcfd..952a4dd2 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
--
GitLab