Skip to content

Commit 789b278

Browse files
committed
Add cluster mode in tests
1 parent 4ed4a58 commit 789b278

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

Makefile

+2-7
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,12 @@ acceptance-tests-run: .env
6464
.PHONY: acceptance-tests-down
6565
acceptance-tests-down: .env
6666
docker compose down || true
67+
acceptance-tests-down:
68+
docker compose down || true
6769
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
6870
bash -c 'rm -rf /mnt/geoserver_datadir/*'
6971
rmdir /tmp/geoserver-data
7072

7173
.PHONY: dist
72-
dist: build-builder
73-
mkdir --parent core/build
74-
rm -rf core/build/libs core/build/distributions
75-
docker run --rm --user=$(shell id -u):$(shell id -g) \
76-
--volume=$(PWD)/core/build:/src/core/build2/:rw mapfish_print_builder \
77-
cp -r /src/core/build/libs /src/core/build/distributions /src/core/build2/
78-
7974
.env:
8075
echo "USER_ID=$(shell id -u):$(shell id -g)" > $@

docker-compose.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,31 @@ services:
1717
LOG_LEVEL: DEBUG
1818
JASPER_LOG_LEVEL: DEBUG
1919

20+
db:
21+
image: camptocamp/postgres:14-postgis-3
22+
environment:
23+
- POSTGRES_PASSWORD=pgpass
24+
- POSTGRES_DB=print
25+
- POSTGRES_USER=print
26+
27+
printclusternode1: &printclusternode
28+
image: mapfish_print_tester
29+
volumes:
30+
- ./examples/src/test/resources/examples:/usr/local/tomcat/webapps/ROOT/print-apps
31+
ports:
32+
- 8081:8080
33+
environment:
34+
PRINT_YAML_MAX_ALIASES: 200
35+
LOG_LEVEL: DEBUG
36+
JASPER_LOG_LEVEL: DEBUG
37+
CATALINA_OUT: /dev/stdout
38+
CATALINA_OPTS: -Ddb.host=db -Ddb.port=5432 -Ddb.username=print -Ddb.password=pgpass -Ddb.name=print -Ddb.schema=public
39+
40+
printclusternode2:
41+
<<: *printclusternode
42+
ports:
43+
- 8082:8080
44+
2045
tests:
2146
image: mapfish_print_builder
2247
user: ${USER_ID}

0 commit comments

Comments
 (0)