sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: test makefiles

Browse Source
This commit is contained in:
Florian Schade
2025-01-22 16:24:36 +01:00
parent 991b641248
commit 4b1f49e169
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/docker/Makefile
+8 -8
View File
@@ -190,22 +190,22 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
@if [ -n "${START_CEPH}" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/ceph.yml \
docker-compose run start_ceph; \
docker compose run start_ceph; \
fi; \
if [ "${START_EMAIL}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/email.yml \
docker-compose run start_email; \
docker compose run start_email; \
fi; \
if [ "${START_ANTIVIRUS}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/antivirus.yml \
docker-compose run start_antivirus; \
docker compose run start_antivirus; \
fi; \
if [ "${START_TIKA}" == "true" ]; then \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=src/tika.yml \
docker-compose run tika-service; \
docker compose run tika-service; \
fi; \
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=$(COMPOSE_FILE) \
@@ -221,13 +221,13 @@ testSuite: $(OC_WRAPPER) build-dev-image clean-docker-container
BEHAT_FEATURE=$(BEHAT_FEATURE) \
DIVIDE_INTO_NUM_PARTS=$(DIVIDE_INTO_NUM_PARTS) \
RUN_PART=$(RUN_PART) \
docker-compose up -d --build --force-recreate
docker compose up -d --build --force-recreate
.PHONY: show-test-logs
show-test-logs: ## show logs of test
@COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
COMPOSE_FILE=$(COMPOSE_FILE) \
docker-compose logs --no-log-prefix -f acceptance-tests | less
docker compose logs --no-log-prefix -f acceptance-tests | less
$(OC_WRAPPER):
@if [ "$(WITH_WRAPPER)" == "true" ]; then \
@@ -254,7 +254,7 @@ clean-docker-container: ## clean docker containers created during acceptance tes
RUN_PART="" \
STORAGE_DRIVER="" \
TEST_SOURCE="" \
docker-compose down --remove-orphans
docker compose down --remove-orphans
.PHONY: clean-docker-volumes
clean-docker-volumes: ## clean docker volumes created during acceptance tests
@@ -266,7 +266,7 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests
RUN_PART="" \
STORAGE_DRIVER="" \
TEST_SOURCE="" \
docker-compose down --remove-orphans -v
docker compose down --remove-orphans -v
.PHONY: clean-files
clean-files: