Skip to content
Snippets Groups Projects
Verified Commit ed67ce46 authored by Martin Weise's avatar Martin Weise
Browse files

Updated test

parent 874d7b97
No related branches found
No related tags found
6 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted
...@@ -15,7 +15,7 @@ services: ...@@ -15,7 +15,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6 image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes: volumes:
- metadata-db-data:/bitnami/mariadb - metadata-db-data:/bitnami/mariadb
- ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql - ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
...@@ -25,6 +25,7 @@ services: ...@@ -25,6 +25,7 @@ services:
environment: environment:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}" MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}" MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck: healthcheck:
test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s interval: 10s
...@@ -37,7 +38,7 @@ services: ...@@ -37,7 +38,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-data-db container_name: dbrepo-data-db
hostname: data-db hostname: data-db
image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6 image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes: volumes:
- data-db-data:/bitnami/mariadb - data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp" - "${SHARED_VOLUME:-/tmp}:/tmp"
...@@ -45,6 +46,7 @@ services: ...@@ -45,6 +46,7 @@ services:
- "3307:3306" - "3307:3306"
environment: environment:
MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}" MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${DATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck: healthcheck:
test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s interval: 10s
...@@ -65,6 +67,7 @@ services: ...@@ -65,6 +67,7 @@ services:
environment: environment:
MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}" MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}"
MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}" MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${AUTH_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck: healthcheck:
test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent
interval: 15s interval: 15s
...@@ -190,7 +193,7 @@ services: ...@@ -190,7 +193,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-broker-service container_name: dbrepo-broker-service
hostname: broker-service hostname: broker-service
image: docker.io/bitnami/rabbitmq:3.12-debian-12 image: docker.io/bitnami/rabbitmq:3.13.7-debian-12-r4
ports: ports:
- 5672:5672 - 5672:5672
- 1883:1883 - 1883:1883
...@@ -200,6 +203,8 @@ services: ...@@ -200,6 +203,8 @@ services:
- ./config/enabled_plugins:/etc/rabbitmq/enabled_plugins - ./config/enabled_plugins:/etc/rabbitmq/enabled_plugins
- ./config/definitions.json:/app/definitions.json - ./config/definitions.json:/app/definitions.json
- broker-service-data:/bitnami/rabbitmq/mnesia - broker-service-data:/bitnami/rabbitmq/mnesia
environment:
RABBITMQ_FEATURE_FLAGS: mqtt_v5
depends_on: depends_on:
dbrepo-identity-service: dbrepo-identity-service:
condition: service_healthy condition: service_healthy
...@@ -251,6 +256,11 @@ services: ...@@ -251,6 +256,11 @@ services:
OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin} OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin} OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info} LOG_LEVEL: ${LOG_LEVEL:-info}
healthcheck:
test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
interval: 10s
timeout: 5s
retries: 12
dbrepo-data-db-sidecar: dbrepo-data-db-sidecar:
restart: "no" restart: "no"
...@@ -279,11 +289,17 @@ services: ...@@ -279,11 +289,17 @@ services:
hostname: ui hostname: ui
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6 image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
environment: environment:
NODE_OPTIONS: "${UI_RUNTIME_OPTIONS:-}"
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files/" NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on:
dbrepo-search-service:
condition: service_healthy
dbrepo-upload-service:
condition: service_healthy
healthcheck: healthcheck:
test: wget -qO- localhost:3000 | grep "Database Repository" || exit 1 test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 12 retries: 12
......
...@@ -304,6 +304,7 @@ test-ui: ...@@ -304,6 +304,7 @@ test-ui:
image: docker.io/docker:24-dind image: docker.io/docker:24-dind
variables: variables:
UI_RUNTIME_OPTIONS: --max_old_space_size=256 UI_RUNTIME_OPTIONS: --max_old_space_size=256
ENDPOINT: http://localhost:3000
needs: needs:
- build-ui - build-ui
dependencies: dependencies:
...@@ -311,7 +312,7 @@ test-ui: ...@@ -311,7 +312,7 @@ test-ui:
before_script: before_script:
- "apk add bash apache2-utils" - "apk add bash apache2-utils"
- "docker compose build dbrepo-ui" - "docker compose build dbrepo-ui"
- "docker compose up -d dbrepo-ui" - "docker run --name dbrepo-ui -p 3000:3000 -d dbrepo-ui:latest"
script: script:
- bash ./dbrepo-ui/test/test_heap.sh || exit 1 - bash ./dbrepo-ui/test/test_heap.sh || exit 1
......
...@@ -3,7 +3,6 @@ CALLS=1000 ...@@ -3,7 +3,6 @@ CALLS=1000
CONCURRENCY=10 CONCURRENCY=10
ENDPOINT=http://localhost ENDPOINT=http://localhost
sleep 10
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/" ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/"
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/search" ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/search"
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/login" ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/login"
......
...@@ -23,7 +23,6 @@ services: ...@@ -23,7 +23,6 @@ services:
ports: ports:
- "3306:3306" - "3306:3306"
environment: environment:
BITNAMI_DEBUG: "true"
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}" MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}" MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}" MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
...@@ -281,6 +280,11 @@ services: ...@@ -281,6 +280,11 @@ services:
OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin} OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin} OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info} LOG_LEVEL: ${LOG_LEVEL:-info}
healthcheck:
test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
interval: 10s
timeout: 5s
retries: 12
dbrepo-data-db-sidecar: dbrepo-data-db-sidecar:
restart: "no" restart: "no"
...@@ -326,8 +330,8 @@ services: ...@@ -326,8 +330,8 @@ services:
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files" NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on: depends_on:
dbrepo-search-service: dbrepo-search-service:
condition: service_started condition: service_healthy
dbrepo-storage-service: dbrepo-upload-service:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment