From 08d9acfa061b07b836be1dc12e451f015de99f3a Mon Sep 17 00:00:00 2001 From: Gil Raphaelli Date: Fri, 15 Nov 2019 17:23:16 -0500 Subject: [PATCH] bump es heap sizes for integration tests and update jolokia test container image (#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 --- metricbeat/module/jolokia/_meta/Dockerfile | 12 ++++++++---- metricbeat/module/jolokia/_meta/jolokia-1.5.0.sum | 1 + testing/environments/latest.yml | 2 +- testing/environments/snapshot-oss.yml | 2 +- testing/environments/snapshot.yml | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 metricbeat/module/jolokia/_meta/jolokia-1.5.0.sum diff --git a/metricbeat/module/jolokia/_meta/Dockerfile b/metricbeat/module/jolokia/_meta/Dockerfile index d4ef0cad43c5..d79cf4640cc9 100644 --- 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 new file mode 100644 index 000000000000..b163700f52d0 --- /dev/null +++ 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 index 2c9df085cd5f..a3e530bccf95 100644 --- 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 index 59cce600a507..a95b4c9f33dc 100644 --- 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 index ff1d550c3fa4..d631fa91d296 100644 --- 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"