From 62cc2a77dbe44a000966e97969f0a0bc432be98d Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Wed, 20 Oct 2021 13:25:36 +0300 Subject: [PATCH] Use new smoke test images (#4439) --- smoke-tests/images/servlet/build.gradle | 19 +++++++++++++ .../smoketest/AppServerTest.groovy | 2 +- .../smoketest/JettySmokeTest.groovy | 28 +++++++++---------- .../smoketest/TomcatSmokeTest.groovy | 14 +++++----- .../smoketest/TomeeSmokeTest.groovy | 22 +++++++++++---- 5 files changed, 57 insertions(+), 28 deletions(-) diff --git a/smoke-tests/images/servlet/build.gradle b/smoke-tests/images/servlet/build.gradle index 918ea1af944a..a4084f1d6d8b 100644 --- a/smoke-tests/images/servlet/build.gradle +++ b/smoke-tests/images/servlet/build.gradle @@ -68,6 +68,25 @@ def targets = [ ] ] +tasks.register("printSmokeTestsConfigurations") { + linuxTargets.each { server, matrices -> + def smokeTestServer = findProperty('smokeTestServer') + if (smokeTestServer != null && server != smokeTestServer) { + return + } + println server + matrices.forEach { entry -> + entry.version.forEach { version -> + entry.jdk.forEach { jdk -> + entry.vm.forEach { vm -> + println "@AppServer(version = \"$version\", jdk = \"$jdk${vm == 'hotspot' ? '' : '-openj9'}\")" + } + } + } + } + } +} + createDockerTasks(buildLinuxTestImagesTask, targets, false) createDockerTasks(buildWindowsTestImagesTask, targets, true) diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 2a02430f49fc..369440e70c67 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -45,7 +45,7 @@ abstract class AppServerTest extends SmokeTest { @Override protected String getTargetImage(String jdk, String serverVersion, boolean windows) { String platformSuffix = windows ? "-windows" : "" - String extraTag = "20210929.1285231297" + String extraTag = "20211020.1362390004" String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag" return getTargetImagePrefix() + ":" + fullSuffix } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy index 57afde9eb72a..c2171a917046 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy @@ -5,20 +5,20 @@ package io.opentelemetry.smoketest -@AppServer(version = "9.4.35", jdk = "8") -@AppServer(version = "9.4.35", jdk = "8-openj9") -@AppServer(version = "9.4.35", jdk = "11") -@AppServer(version = "9.4.35", jdk = "11-openj9") -@AppServer(version = "9.4.35", jdk = "16") -@AppServer(version = "9.4.35", jdk = "16-openj9") -@AppServer(version = "10.0.0", jdk = "11") -@AppServer(version = "10.0.0", jdk = "11-openj9") -@AppServer(version = "10.0.0", jdk = "16") -@AppServer(version = "10.0.0", jdk = "16-openj9") -@AppServer(version = "11.0.1", jdk = "11") -@AppServer(version = "11.0.1", jdk = "11-openj9") -@AppServer(version = "11.0.1", jdk = "16") -@AppServer(version = "11.0.1", jdk = "16-openj9") +@AppServer(version = "9.4.39", jdk = "8") +@AppServer(version = "9.4.39", jdk = "8-openj9") +@AppServer(version = "9.4.39", jdk = "11") +@AppServer(version = "9.4.39", jdk = "11-openj9") +@AppServer(version = "9.4.39", jdk = "17") +@AppServer(version = "9.4.39", jdk = "16-openj9") +@AppServer(version = "10.0.7", jdk = "11") +@AppServer(version = "10.0.7", jdk = "11-openj9") +@AppServer(version = "10.0.7", jdk = "17") +@AppServer(version = "10.0.7", jdk = "16-openj9") +@AppServer(version = "11.0.7", jdk = "11") +@AppServer(version = "11.0.7", jdk = "11-openj9") +@AppServer(version = "11.0.7", jdk = "17") +@AppServer(version = "11.0.7", jdk = "16-openj9") class JettySmokeTest extends AppServerTest { protected String getTargetImagePrefix() { diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy index d1b7652f6061..7a582c006d62 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy @@ -8,20 +8,20 @@ package io.opentelemetry.smoketest @AppServer(version = "7.0.109", jdk = "8") @AppServer(version = "7.0.109", jdk = "8-openj9") @AppServer(version = "8.5.71", jdk = "8") +@AppServer(version = "8.5.71", jdk = "8-openj9") @AppServer(version = "8.5.71", jdk = "11") +@AppServer(version = "8.5.71", jdk = "11-openj9") @AppServer(version = "8.5.71", jdk = "17") -@AppServer(version = "8.5.70", jdk = "8-openj9") -@AppServer(version = "8.5.70", jdk = "11-openj9") @AppServer(version = "9.0.53", jdk = "8") +@AppServer(version = "9.0.53", jdk = "8-openj9") @AppServer(version = "9.0.53", jdk = "11") +@AppServer(version = "9.0.53", jdk = "11-openj9") @AppServer(version = "9.0.53", jdk = "17") -@AppServer(version = "9.0.52", jdk = "8-openj9") -@AppServer(version = "9.0.52", jdk = "11-openj9") -// TODO (trask) there are Tomcat 10 images for Java 8 (both hotspot and openj9) -// but smoke tests are currently failing on them +@AppServer(version = "10.0.11", jdk = "8") +@AppServer(version = "10.0.11", jdk = "8-openj9") @AppServer(version = "10.0.11", jdk = "11") +@AppServer(version = "10.0.11", jdk = "11-openj9") @AppServer(version = "10.0.11", jdk = "17") -@AppServer(version = "10.0.8", jdk = "11-openj9") class TomcatSmokeTest extends AppServerTest { protected String getTargetImagePrefix() { diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy index 43b858e91df3..d9b7301525dc 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy @@ -7,12 +7,22 @@ package io.opentelemetry.smoketest import java.time.Duration -@AppServer(version = "7.0.0", jdk = "8") -@AppServer(version = "7.0.0", jdk = "8-openj9") -@AppServer(version = "8.0.6", jdk = "8") -@AppServer(version = "8.0.6", jdk = "8-openj9") -@AppServer(version = "8.0.6", jdk = "11") -@AppServer(version = "8.0.6", jdk = "11-openj9") +@AppServer(version = "7.0.9", jdk = "8") +@AppServer(version = "7.0.9", jdk = "8-openj9") +@AppServer(version = "7.1.4", jdk = "8") +@AppServer(version = "7.1.4", jdk = "8-openj9") +@AppServer(version = "8.0.8", jdk = "8") +@AppServer(version = "8.0.8", jdk = "8-openj9") +@AppServer(version = "8.0.8", jdk = "11") +@AppServer(version = "8.0.8", jdk = "11-openj9") +@AppServer(version = "8.0.8", jdk = "17") +@AppServer(version = "8.0.8", jdk = "16-openj9") +@AppServer(version = "9.0.0-M7", jdk = "8") +@AppServer(version = "9.0.0-M7", jdk = "8-openj9") +@AppServer(version = "9.0.0-M7", jdk = "11") +@AppServer(version = "9.0.0-M7", jdk = "11-openj9") +@AppServer(version = "9.0.0-M7", jdk = "17") +@AppServer(version = "9.0.0-M7", jdk = "16-openj9") class TomeeSmokeTest extends AppServerTest { protected String getTargetImagePrefix() {