bump es heap sizes for integration tests and update jolokia test cont…

…ainer image (elastic#14543) * bump es heap sizes for integration tests * update path to jolokia-war.war * get jolokia-war from maven and verify content also separate tomcat and retry steps for some layer caching
michalpristas · Nov 15, 2019 · 08d9acf · 08d9acf
1 parent fc2ac4d
commit 08d9acf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/metricbeat/module/jolokia/_meta/Dockerfile b/metricbeat/module/jolokia/_meta/Dockerfile
@@ -11,14 +11,18 @@ RUN apk update && \
 HEALTHCHECK --interval=1s --retries=90 CMD curl -f localhost:8778/jolokia/
 EXPOSE 8778
 
+COPY jolokia-${JOLOKIA_VERSION}.sum jolokia.sum
+
 # Prepare a server where jolokia runs in proxy mode
 RUN wget http://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/${TC}.tar.gz && \
     tar xzf ${TC}.tar.gz -C /usr && \
     rm ${TC}.tar.gz && \
-    sed -i -e 's/Connector port="8080"/Connector port="8778"/g' /usr/${TC}/conf/server.xml && \
-    curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \
-    retry --min 1 --max 180 -- curl -J -L -s -f --show-error -o /usr/${TC}/webapps/jolokia.war \
-        "https://oss.sonatype.org/content/repositories/releases/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war"
+    sed -i -e 's/Connector port="8080"/Connector port="8778"/g' /usr/${TC}/conf/server.xml
+RUN curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin
+RUN retry --min 1 --max 180 -- curl -J -L -s -f --show-error -O \
+        "https://repo1.maven.org/maven2/org/jolokia/jolokia-war/${JOLOKIA_VERSION}/jolokia-war-${JOLOKIA_VERSION}.war" && \
+    sha256sum -c jolokia.sum && \
+    mv jolokia-war-${JOLOKIA_VERSION}.war /usr/${TC}/webapps/jolokia.war && rm jolokia.sum
 
 # JMX setting to request authentication with remote connection
 RUN echo "monitorRole QED" >> /usr/lib/jvm/java-1.8-openjdk/jre/lib/management/jmxremote.password && \

diff --git a/metricbeat/module/jolokia/_meta/jolokia-1.5.0.sum b/metricbeat/module/jolokia/_meta/jolokia-1.5.0.sum
@@ -0,0 +1 @@
+7212d3f5637dea0863356454dd37b7ae4fc45b6d7e0e929b42312d215ce6f2b8  jolokia-war-1.5.0.war
diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml
@@ -9,7 +9,7 @@ services:
       retries: 300
       interval: 1s
     environment:
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
       - "network.host="
       - "transport.host=127.0.0.1"
       - "http.host=0.0.0.0"

diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml
@@ -9,7 +9,7 @@ services:
       retries: 300
       interval: 1s
     environment:
-    - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
     - "network.host="
     - "transport.host=127.0.0.1"
     - "http.host=0.0.0.0"

diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
@@ -9,7 +9,7 @@ services:
       retries: 300
       interval: 1s
     environment:
-    - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
     - "network.host="
     - "transport.host=127.0.0.1"
     - "http.host=0.0.0.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		7212d3f5637dea0863356454dd37b7ae4fc45b6d7e0e929b42312d215ce6f2b8 jolokia-war-1.5.0.war