summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-07-03 12:46:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-07-03 12:46:48 +0000
commit0da8dc80f636b29c3c9f0bd0cf94d5118fa78670 (patch)
tree4a6b56c68a2c931533c6606740c52493a4322ef1
parent30a29e4d6153a5f7877ac02adaff0ad60abf11a5 (diff)
parentd332be11ab86f2922117e1d672fe72917578b673 (diff)
Merge "ElasticContainer: Limit heap usage for test containers" into stable-2.14
-rw-r--r--gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
index de0eeabf29..95f7f1d57d 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
@@ -30,6 +30,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
// See https://github.com/testcontainers/testcontainers-java/issues/343
try {
ElasticContainer<?> container = new ElasticContainer<>(version);
+ container.addEnv("ES_JAVA_OPTS", "-Xms128m -Xmx128m");
container.start();
return container;
} catch (Throwable t) {