Merge pull request #6851 from smatvienko-tb/black-box-test-memory-limit
[3.4] Black box tests memory limit
This commit is contained in:
commit
9c63a89174
@ -26,3 +26,6 @@ LOAD_BALANCER_NAME=haproxy-certbot
|
|||||||
|
|
||||||
# If enabled Prometheus and Grafana containers are deployed along with other containers
|
# If enabled Prometheus and Grafana containers are deployed along with other containers
|
||||||
MONITORING_ENABLED=false
|
MONITORING_ENABLED=false
|
||||||
|
|
||||||
|
# Limit memory usage for each Java application
|
||||||
|
# JAVA_OPTS=-Xmx2048M -Xms2048M -Xss384k -XX:+AlwaysPreTouch
|
||||||
|
|||||||
@ -48,6 +48,7 @@ services:
|
|||||||
TB_SERVICE_ID: tb-core1
|
TB_SERVICE_ID: tb-core1
|
||||||
TB_SERVICE_TYPE: tb-core
|
TB_SERVICE_TYPE: tb-core
|
||||||
EDGES_ENABLED: "true"
|
EDGES_ENABLED: "true"
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-node.env
|
- tb-node.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -73,6 +74,7 @@ services:
|
|||||||
TB_SERVICE_ID: tb-core2
|
TB_SERVICE_ID: tb-core2
|
||||||
TB_SERVICE_TYPE: tb-core
|
TB_SERVICE_TYPE: tb-core
|
||||||
EDGES_ENABLED: "true"
|
EDGES_ENABLED: "true"
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-node.env
|
- tb-node.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -96,6 +98,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-rule-engine1
|
TB_SERVICE_ID: tb-rule-engine1
|
||||||
TB_SERVICE_TYPE: tb-rule-engine
|
TB_SERVICE_TYPE: tb-rule-engine
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-node.env
|
- tb-node.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -117,6 +120,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-rule-engine2
|
TB_SERVICE_ID: tb-rule-engine2
|
||||||
TB_SERVICE_TYPE: tb-rule-engine
|
TB_SERVICE_TYPE: tb-rule-engine
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-node.env
|
- tb-node.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -132,6 +136,7 @@ services:
|
|||||||
- "1883"
|
- "1883"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-mqtt-transport1
|
TB_SERVICE_ID: tb-mqtt-transport1
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-mqtt-transport.env
|
- tb-mqtt-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -148,6 +153,7 @@ services:
|
|||||||
- "1883"
|
- "1883"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-mqtt-transport2
|
TB_SERVICE_ID: tb-mqtt-transport2
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-mqtt-transport.env
|
- tb-mqtt-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -164,6 +170,7 @@ services:
|
|||||||
- "8081"
|
- "8081"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-http-transport1
|
TB_SERVICE_ID: tb-http-transport1
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-http-transport.env
|
- tb-http-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -180,6 +187,7 @@ services:
|
|||||||
- "8081"
|
- "8081"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-http-transport2
|
TB_SERVICE_ID: tb-http-transport2
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-http-transport.env
|
- tb-http-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -196,6 +204,7 @@ services:
|
|||||||
- "5683:5683/udp"
|
- "5683:5683/udp"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-coap-transport
|
TB_SERVICE_ID: tb-coap-transport
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-coap-transport.env
|
- tb-coap-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -212,6 +221,7 @@ services:
|
|||||||
- "5685:5685/udp"
|
- "5685:5685/udp"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-lwm2m-transport
|
TB_SERVICE_ID: tb-lwm2m-transport
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-lwm2m-transport.env
|
- tb-lwm2m-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -226,6 +236,7 @@ services:
|
|||||||
image: "${DOCKER_REPO}/${SNMP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
|
image: "${DOCKER_REPO}/${SNMP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-snmp-transport
|
TB_SERVICE_ID: tb-snmp-transport
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-snmp-transport.env
|
- tb-snmp-transport.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -256,6 +267,7 @@ services:
|
|||||||
- "8081"
|
- "8081"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-vc-executor1
|
TB_SERVICE_ID: tb-vc-executor1
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-vc-executor.env
|
- tb-vc-executor.env
|
||||||
volumes:
|
volumes:
|
||||||
@ -272,6 +284,7 @@ services:
|
|||||||
- "8081"
|
- "8081"
|
||||||
environment:
|
environment:
|
||||||
TB_SERVICE_ID: tb-vc-executor2
|
TB_SERVICE_ID: tb-vc-executor2
|
||||||
|
JAVA_OPTS: "${JAVA_OPTS}"
|
||||||
env_file:
|
env_file:
|
||||||
- tb-vc-executor.env
|
- tb-vc-executor.env
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@ -46,6 +46,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
|
|||||||
private final static String TB_MQTT_TRANSPORT_LOG_VOLUME = "tb-mqtt-transport-log-test-volume";
|
private final static String TB_MQTT_TRANSPORT_LOG_VOLUME = "tb-mqtt-transport-log-test-volume";
|
||||||
private final static String TB_SNMP_TRANSPORT_LOG_VOLUME = "tb-snmp-transport-log-test-volume";
|
private final static String TB_SNMP_TRANSPORT_LOG_VOLUME = "tb-snmp-transport-log-test-volume";
|
||||||
private final static String TB_VC_EXECUTOR_LOG_VOLUME = "tb-vc-executor-log-test-volume";
|
private final static String TB_VC_EXECUTOR_LOG_VOLUME = "tb-vc-executor-log-test-volume";
|
||||||
|
private final static String JAVA_OPTS = "-Xmx384m -Xss256k";
|
||||||
|
|
||||||
private final DockerComposeExecutor dockerCompose;
|
private final DockerComposeExecutor dockerCompose;
|
||||||
|
|
||||||
@ -102,6 +103,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
|
|||||||
dockerCompose = new DockerComposeExecutor(composeFiles, project);
|
dockerCompose = new DockerComposeExecutor(composeFiles, project);
|
||||||
|
|
||||||
env = new HashMap<>();
|
env = new HashMap<>();
|
||||||
|
env.put("JAVA_OPTS", JAVA_OPTS);
|
||||||
env.put("POSTGRES_DATA_VOLUME", postgresDataVolume);
|
env.put("POSTGRES_DATA_VOLUME", postgresDataVolume);
|
||||||
if (IS_HYBRID_MODE) {
|
if (IS_HYBRID_MODE) {
|
||||||
env.put("CASSANDRA_DATA_VOLUME", cassandraDataVolume);
|
env.put("CASSANDRA_DATA_VOLUME", cassandraDataVolume);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user