Skip to content

Commit b8306a9

Browse files
committed
Add cluster mode in tests
1 parent 4ab4391 commit b8306a9

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build:
1515

1616
.PHONY: acceptance-tests-up
1717
acceptance-tests-up:
18-
docker-compose down --remove-orphan
18+
docker compose down
1919

2020
mkdir /tmp/geoserver-data || true
2121
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver:2.17 \
@@ -24,17 +24,17 @@ acceptance-tests-up:
2424
cp -r examples/geoserver-data/* /tmp/geoserver-data/
2525
cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/
2626

27-
docker-compose up -d
27+
docker compose up -d
2828

2929
.PHONY: acceptance-tests-run
3030
acceptance-tests-run:
31-
docker-compose exec -T tests gradle :examples:integrationTest
31+
docker compose exec -T tests gradle :examples:integrationTest
3232
ci/check-fonts
3333
ci/validate-container
3434

3535
.PHONY: acceptance-tests-down
3636
acceptance-tests-down:
37-
docker-compose down || true
37+
docker compose down || true
3838
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
3939
bash -c 'rm -rf /mnt/geoserver_datadir/*'
4040
rmdir /tmp/geoserver-data

docker-compose.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,31 @@ services:
1919
JASPER_LOG_LEVEL: DEBUG
2020
CATALINA_OUT: /dev/stdout
2121

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

0 commit comments

Comments
 (0)