From f446d727411dc083f26b47cf7d85ecc11480d7f5 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 08:37:25 -0700 Subject: [PATCH 1/7] Add Java 23 to the smoke test matrix --- smoke-tests/images/servlet/build.gradle.kts | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts index 3614722c487b..674f91bc5675 100644 --- a/smoke-tests/images/servlet/build.gradle.kts +++ b/smoke-tests/images/servlet/build.gradle.kts @@ -24,10 +24,10 @@ val extraTag = findProperty("extraTag") // Dockerfile name, args key passes raw arguments to docker build val targets = mapOf( "jetty" to listOf( - ImageTarget(listOf("9.4.53"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21"), mapOf("sourceVersion" to "9.4.53.v20231009")), - ImageTarget(listOf("10.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("sourceVersion" to "10.0.19")), - ImageTarget(listOf("11.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("sourceVersion" to "11.0.19"), "servlet-5.0"), - ImageTarget(listOf("12.0.6"), listOf("hotspot", "openj9"), listOf("17", "21"), mapOf("sourceVersion" to "12.0.6"), "servlet-5.0"), + ImageTarget(listOf("9.4.53"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("sourceVersion" to "9.4.53.v20231009")), + ImageTarget(listOf("10.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("sourceVersion" to "10.0.19")), + ImageTarget(listOf("11.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("sourceVersion" to "11.0.19"), "servlet-5.0"), + ImageTarget(listOf("12.0.6"), listOf("hotspot", "openj9"), listOf("17", "21", "23"), mapOf("sourceVersion" to "12.0.6"), "servlet-5.0"), ), "liberty" to listOf( ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")), @@ -41,18 +41,18 @@ val targets = mapOf( ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")), // Test application is not deployed when server is sarted with hotspot jdk version 21 ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"), - ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21"), war = "servlet-5.0") + ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21", "23"), war = "servlet-5.0") ), "tomcat" to listOf( ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")), - ImageTarget(listOf("8.5.98"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21"), mapOf("majorVersion" to "8")), - ImageTarget(listOf("9.0.85"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21"), mapOf("majorVersion" to "9")), - ImageTarget(listOf("10.1.18"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("majorVersion" to "10"), "servlet-5.0"), + ImageTarget(listOf("8.5.98"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("majorVersion" to "8")), + ImageTarget(listOf("9.0.85"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("majorVersion" to "9")), + ImageTarget(listOf("10.1.18"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("majorVersion" to "10"), "servlet-5.0"), ), "tomee" to listOf( ImageTarget(listOf("7.0.9", "7.1.4"), listOf("hotspot", "openj9"), listOf("8")), - ImageTarget(listOf("8.0.16"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21")), - ImageTarget(listOf("9.1.2"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), war = "servlet-5.0"), + ImageTarget(listOf("8.0.16"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23")), + ImageTarget(listOf("9.1.2"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), war = "servlet-5.0"), ), "websphere" to listOf( ImageTarget(listOf("8.5.5.22", "9.0.5.14"), listOf("openj9"), listOf("8"), windows = false), @@ -62,12 +62,12 @@ val targets = mapOf( ImageTarget( listOf("17.0.1.Final", "21.0.0.Final"), listOf("hotspot", "openj9"), - listOf("8", "11", "17", "21") + listOf("8", "11", "17", "21", "23") ), ImageTarget( listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"), listOf("hotspot", "openj9"), - listOf("11", "17", "21"), + listOf("11", "17", "21", "23"), war = "servlet-5.0" ), ), @@ -153,7 +153,7 @@ fun configureImage( val image = "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag" val jdkImage = if (vm == "hotspot") { - if (jdk == "21") { + if (jdk == "24") { // "The only tags which will continue to receive updates beyond July 2022 will be Early Access // builds (which are sourced from jdk.java.net), as those are not published/supported by any // of the above projects." From 866ad82568a5f9fc8214022481008a0b016cbf39 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 11:10:32 -0700 Subject: [PATCH 2/7] curl -> wget --- smoke-tests/images/servlet/src/wildfly.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index 8831c9b4756b..c7a4b555390e 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -27,7 +27,7 @@ RUN echo curl -O -L $DOWNLOAD_URL # Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content # Make sure the distribution is available from a well-known place RUN cd $HOME \ - && curl -O -L $DOWNLOAD_URL \ + && wget $DOWNLOAD_URL \ && tar xf wildfly-$WILDFLY_VERSION.tar.gz \ && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \ && rm wildfly-$WILDFLY_VERSION.tar.gz \ From 89e8d1f2fb8321f55b3aa852d7c1ab50927c0648 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 12:07:07 -0700 Subject: [PATCH 3/7] wget --- smoke-tests/images/servlet/src/wildfly.dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index c7a4b555390e..bf77ec7420cb 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -22,12 +22,16 @@ ENV WILDFLY_VERSION=${version} ENV DOWNLOAD_URL=${baseDownloadUrl}.tar.gz ENV JBOSS_HOME /opt/jboss/wildfly +# latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) +# but ibm-semeru-runtimes docker images lack wget +RUN apt-get update && apt-get -y install wget + USER root RUN echo curl -O -L $DOWNLOAD_URL # Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content # Make sure the distribution is available from a well-known place RUN cd $HOME \ - && wget $DOWNLOAD_URL \ + && wget -nv $DOWNLOAD_URL \ && tar xf wildfly-$WILDFLY_VERSION.tar.gz \ && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \ && rm wildfly-$WILDFLY_VERSION.tar.gz \ From 461c655649c4e8816c87caed5dc5306be427bb8d Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 12:14:30 -0700 Subject: [PATCH 4/7] sudo --- smoke-tests/images/servlet/src/wildfly.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index bf77ec7420cb..010d94787bda 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -24,7 +24,7 @@ ENV JBOSS_HOME /opt/jboss/wildfly # latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) # but ibm-semeru-runtimes docker images lack wget -RUN apt-get update && apt-get -y install wget +RUN sudo apt-get update && sudo apt-get -y install wget USER root RUN echo curl -O -L $DOWNLOAD_URL From d17e8d47a54f83ba16bf879cdecabdbb3ecacc6b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 14:15:16 -0700 Subject: [PATCH 5/7] try --- smoke-tests/images/servlet/src/wildfly.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index 010d94787bda..0f3cb66b1396 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -24,7 +24,7 @@ ENV JBOSS_HOME /opt/jboss/wildfly # latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) # but ibm-semeru-runtimes docker images lack wget -RUN sudo apt-get update && sudo apt-get -y install wget +RUN apt-get -y install wget USER root RUN echo curl -O -L $DOWNLOAD_URL From 79fbe0b5f6e4a84772ce4af1da29f5f067000778 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 14:25:30 -0700 Subject: [PATCH 6/7] try --- smoke-tests/images/servlet/src/wildfly.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index 0f3cb66b1396..a55fb9b40050 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -14,6 +14,10 @@ RUN groupadd -r jboss -g 1001 && useradd -u 1001 -r -g jboss -m -d /opt/jboss -s # Set the working directory to jboss' user home directory WORKDIR /opt/jboss +# latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) +# but ibm-semeru-runtimes docker images lack wget +RUN apt-get -y install wget + # Specify the user which should be used to execute all commands below USER jboss @@ -22,10 +26,6 @@ ENV WILDFLY_VERSION=${version} ENV DOWNLOAD_URL=${baseDownloadUrl}.tar.gz ENV JBOSS_HOME /opt/jboss/wildfly -# latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) -# but ibm-semeru-runtimes docker images lack wget -RUN apt-get -y install wget - USER root RUN echo curl -O -L $DOWNLOAD_URL # Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content From f3c39c41f49ccbfb4695a738a93f5ab08d9ff3c3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 24 Sep 2024 14:54:04 -0700 Subject: [PATCH 7/7] try --- smoke-tests/images/servlet/src/wildfly.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/images/servlet/src/wildfly.dockerfile b/smoke-tests/images/servlet/src/wildfly.dockerfile index a55fb9b40050..60ea629cef00 100644 --- a/smoke-tests/images/servlet/src/wildfly.dockerfile +++ b/smoke-tests/images/servlet/src/wildfly.dockerfile @@ -16,7 +16,7 @@ WORKDIR /opt/jboss # latest eclipse-temurin docker images have removed curl in favor of wget (https://github.com/adoptium/containers/issues/630) # but ibm-semeru-runtimes docker images lack wget -RUN apt-get -y install wget +RUN apt-get update && apt-get -y install wget # Specify the user which should be used to execute all commands below USER jboss