commit 0da8dc80f636b29c3c9f0bd0cf94d5118fa78670
author David Pursehouse <dpursehouse@collab.net> Tue Jul 03 12:46:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 03 12:46:48 2018 +0000
tree 4a6b56c68a2c931533c6606740c52493a4322ef1
parent 30a29e4d6153a5f7877ac02adaff0ad60abf11a5
parent d332be11ab86f2922117e1d672fe72917578b673

Merge "ElasticContainer: Limit heap usage for test containers" into stable-2.14

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java

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 de0eeab..95f7f1d 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 @@
     // 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) {