Skip to content

Commit 78a2c7a

Browse files
karestikaresti
committed
Change how to run the server for tests
1 parent 4e17271 commit 78a2c7a

File tree

7 files changed

+94
-306
lines changed

7 files changed

+94
-306
lines changed

‎.github/workflows/pull_requests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
name: Start 2 Cross-site Infinispan Servers Latest Version
3636
shell: bash
3737
run: |
38-
docker run -d -p 11222:11222 -v ${{ github.workspace }}/scripts/identities.batch:/user-config/identities.batch -v ${{ github.workspace }}/dist:/opt/infinispan/static/console -v ${{ github.workspace }}/scripts/infinispan-basic-auth.xml:/opt/infinispan/server/conf/infinispan.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656" -e IDENTITIES_BATCH="/user-config/identities.batch" quay.io/infinispan-test/server:main --node-name=infinispan-4-e2e
39-
docker run -d -p 31222:11222 -v ${{ github.workspace }}/scripts/identities.batch:/user-config/identities.batch -v ${{ github.workspace }}/dist:/opt/infinispan/static/console -v ${{ github.workspace }}/scripts/infinispan-basic-auth.xml:/opt/infinispan/server/conf/infinispan.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=NYC -Djgroups.mcast_port=46666" -e IDENTITIES_BATCH="/user-config/identities.batch" quay.io/infinispan-test/server:main --node-name=infinispan-4-e2e
38+
docker run -d -p 11222:11222 -v ${{ github.workspace }}/scripts/identities.batch:/user-config/identities.batch -v ${{ github.workspace }}/dist:/opt/infinispan/static/console -v ${{ github.workspace }}/scripts/e2eTestsConfigLON.xml:/user-config/e2eTestsConfigLON.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656" -e IDENTITIES_BATCH="/user-config/identities.batch" quay.io/infinispan-test/server:main --node-name=infinispan-4-e2e-lon -c infinispan-xsite.xml -c "/user-config/e2eTestsConfigLON.xml"
39+
docker run -d -p 31222:11222 -v ${{ github.workspace }}/scripts/identities.batch:/user-config/identities.batch -v ${{ github.workspace }}/dist:/opt/infinispan/static/console -v ${{ github.workspace }}/scripts/e2eTestsConfigNYC.xml:/user-config/e2eTestsConfigNYC.xmll -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=NYC -Djgroups.mcast_port=46666" -e IDENTITIES_BATCH="/user-config/identities.batch" quay.io/infinispan-test/server:main --node-name=infinispan-4-e2e-nyc -c infinispan-xsite.xml -c "/user-config/e2eTestsConfigNYC.xml"
4040
# Wait for server to startup
4141
curl --fail --silent --show-error --retry-all-errors --retry 240 --retry-delay 1 http://localhost:11222/rest/v2/cache-managers/default/health/status > /dev/null
4242
curl --fail --silent --show-error --retry-all-errors --retry 240 --retry-delay 1 http://localhost:31222/rest/v2/cache-managers/default/health/status > /dev/null

‎run-server-for-e2e-container.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
#!/usr/bin/env bash
1+
#!/bin/bash
2+
shopt -s expand_aliases
3+
alias docker='podman'
24
set -e
35

46
ABSOLUTE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
57
echo ${ABSOLUTE_PATH}
68
SERVER_IMAGE_URL="${SERVER_IMAGE_URL:-quay.io/infinispan-test/server:main}"
79

810
docker pull ${SERVER_IMAGE_URL}
9-
docker run --name ispn-lon -d -p 11222:11222 -v ${ABSOLUTE_PATH}/scripts/identities.batch:/user-config/identities.batch -v ${ABSOLUTE_PATH}/dist:/opt/infinispan/static/console -v ${ABSOLUTE_PATH}/scripts/infinispan-basic-auth.xml:/opt/infinispan/server/conf/infinispan.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656" -e IDENTITIES_BATCH="/user-config/identities.batch" ${SERVER_IMAGE_URL} --node-name=infinispan-4-e2e
10-
docker run --name ispn-nyc -d -p 31222:11222 -v ${ABSOLUTE_PATH}/scripts/identities.batch:/user-config/identities.batch -v ${ABSOLUTE_PATH}/dist:/opt/infinispan/static/console -v ${ABSOLUTE_PATH}/scripts/infinispan-basic-auth.xml:/opt/infinispan/server/conf/infinispan.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=NYC -Djgroups.mcast_port=46666" -e IDENTITIES_BATCH="/user-config/identities.batch" ${SERVER_IMAGE_URL} --node-name=infinispan-4-e2e
11+
docker run --name ispn-lon -d -p 11222:11222 -v ${ABSOLUTE_PATH}/scripts/identities.batch:/user-config/identities.batch -v ${ABSOLUTE_PATH}/dist:/opt/infinispan/static/console -v ${ABSOLUTE_PATH}/scripts/e2eTestsConfigLON.xml:/user-config/e2eTestsConfigLON.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656" -e IDENTITIES_BATCH="/user-config/identities.batch" ${SERVER_IMAGE_URL} --node-name=infinispan-4-lon-e2e -c infinispan-xsite.xml -c "/user-config/e2eTestsConfigLON.xml"
12+
docker run --name ispn-nyc -d -p 31222:11222 -v ${ABSOLUTE_PATH}/scripts/identities.batch:/user-config/identities.batch -v ${ABSOLUTE_PATH}/dist:/opt/infinispan/static/console -v ${ABSOLUTE_PATH}/scripts/e2eTestsConfigNYC.xml:/user-config/e2eTestsConfigNYC.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m -Dinfinispan.site.name=NYC -Djgroups.mcast_port=46666" -e IDENTITIES_BATCH="/user-config/identities.batch" ${SERVER_IMAGE_URL} --node-name=infinispan-4-nyc-e2e -c infinispan-xsite.xml -c "/user-config/e2eTestsConfigNYC.xml"
1113

1214
#Adding nashorn libraries to both containers
1315
for containerId in $(docker ps -q)

‎run-server-for-e2e-podman.sh‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎scripts/e2eTestsConfigLON.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<infinispan>
2+
<cache-container name="default" statistics="true">
3+
<metrics accurate-size="true"/>
4+
<tracing collector-endpoint="http://localhost:4318"
5+
enabled="true"
6+
exporter-protocol="OTLP"
7+
service-name="infinispan-server"
8+
security="false" />
9+
<security>
10+
<authorization/>
11+
</security>
12+
<distributed-cache name="people" statistics="true">
13+
<encoding media-type="application/x-protostream"/>
14+
<transaction mode="NON_XA"/>
15+
</distributed-cache>
16+
<distributed-cache-configuration name="e2e-test-template">
17+
<encoding media-type="application/x-protostream"/>
18+
</distributed-cache-configuration>
19+
<distributed-cache name="heap-test" statistics="true">
20+
<encoding media-type="application/x-protostream"/>
21+
<transaction mode="NON_XA"/>
22+
<memory storage="HEAP" max-size="1.5GB"/>
23+
</distributed-cache>
24+
<distributed-cache name="off-heap-test" statistics="true">
25+
<encoding media-type="application/x-protostream"/>
26+
<transaction mode="NON_XA"/>
27+
<memory storage="OFF_HEAP"/>
28+
</distributed-cache>
29+
<invalidation-cache name="invalidationCache" mode="SYNC" statistics="true">
30+
<encoding media-type="application/x-protostream"/>
31+
</invalidation-cache>
32+
<distributed-cache name="a-rbac-test-cache" statistics="true">
33+
<encoding media-type="application/x-protostream"/>
34+
<security>
35+
<authorization enabled="true" roles="admin application deployer"/>
36+
</security>
37+
<indexing enabled="true" startup-mode="reindex">
38+
<indexed-entities>
39+
<indexed-entity>org.infinispan.Car</indexed-entity>
40+
</indexed-entities>
41+
</indexing>
42+
<persistence passivation="false">
43+
<file-store>
44+
<data path="data"/>
45+
<index path="index"/>
46+
</file-store>
47+
</persistence>
48+
<memory storage="HEAP" max-size="1.5GB"/>
49+
</distributed-cache>
50+
</cache-container>
51+
<server>
52+
<endpoints>
53+
<endpoint socket-binding="default" security-realm="default" >
54+
<hotrod-connector name="hotrod">
55+
<authentication>
56+
<sasl mechanisms="PLAIN" server-name="infinispan"/>
57+
</authentication>
58+
</hotrod-connector>
59+
<rest-connector name="rest">
60+
<authentication mechanisms="BASIC DIGEST"/>
61+
</rest-connector>
62+
</endpoint>
63+
</endpoints>
64+
</server>
65+
</infinispan>

‎scripts/e2eTestsConfigNYC.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<infinispan>
2+
<cache-container name="default" statistics="true">
3+
<metrics accurate-size="true"/>
4+
<security>
5+
<authorization/>
6+
</security>
7+
</cache-container>
8+
<server>
9+
<endpoints>
10+
<endpoint socket-binding="default" security-realm="default" >
11+
<hotrod-connector name="hotrod">
12+
<authentication>
13+
<sasl mechanisms="PLAIN" server-name="infinispan"/>
14+
</authentication>
15+
</hotrod-connector>
16+
<rest-connector name="rest">
17+
<authentication mechanisms="BASIC DIGEST"/>
18+
</rest-connector>
19+
</endpoint>
20+
</endpoints>
21+
</server>
22+
</infinispan>

‎scripts/infinispan-basic-auth.xml‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)