From c58001d59d03aefec3e63a25f5010a17aad16084 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 17 Sep 2023 13:34:09 +0200
Subject: [PATCH] Improve default env tests
---
.gitlab-ci.yml | 2 ++
docker-compose.yml | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc68ed7dbc..6028862ea5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,6 +127,7 @@ test-default-deployment:
needs:
- test-frontend
script:
+ - "make teardown"
- "rm -f .env"
- "docker compose up -d || docker compose down"
coverage: '/TOTAL.*?([0-9]{1,3})%/'
@@ -136,6 +137,7 @@ test-env-deployment:
needs:
- test-frontend
script:
+ - "make teardown"
- "cp .env.unix.example .env"
- "docker compose up -d || docker compose down"
diff --git a/docker-compose.yml b/docker-compose.yml
index c8c0f5534b..6d7771334b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,7 +47,7 @@ services:
MARIADB_DATABASE: "${METADATA_DB:-fda}"
MARIADB_ROOT_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
+ test: mysqladmin ping --user="${METADATA_USERNAME:-root}" --password="${METADATA_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -70,7 +70,7 @@ services:
environment:
MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
+ test: mysqladmin ping --user="${USER_DB_USERNAME:-root}" --password="${USER_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
@@ -93,7 +93,7 @@ services:
MARIADB_DATABASE: "${AUTH_DB:-keycloak}"
MARIADB_ROOT_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="$AUTH_USERNAME" --password="$AUTH_PASSWORD" --silent
+ test: mysqladmin ping --user="${AUTH_USERNAME:-root}" --password="${AUTH_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
--
GitLab