open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tomcat 10 and Jetty 11 smoke tests (#2723)

This commit is contained in:
Ago Allikmaa 2021-04-06 08:23:48 +03:00 committed by GitHub
parent 035b3f42f7
commit 314794eaae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy
View File

@ -42,7 +42,7 @@ abstract class AppServerTest extends SmokeTest {
@Override @Override
protected String getTargetImage(String jdk, String serverVersion, boolean windows) { protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
String platformSuffix = windows ? "-windows" : "" String platformSuffix = windows ? "-windows" : ""
String extraTag = "20210316.657616194" String extraTag = "20210405.720145828"
String fullSuffix = "-${serverVersion}-jdk$jdk$platformSuffix-$extraTag" String fullSuffix = "-${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
return getTargetImagePrefix() + fullSuffix return getTargetImagePrefix() + fullSuffix
} }

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
View File

@ -13,6 +13,10 @@ package io.opentelemetry.smoketest
@AppServer(version = "10.0.0", jdk = "11-openj9") @AppServer(version = "10.0.0", jdk = "11-openj9")
@AppServer(version = "10.0.0", jdk = "15") @AppServer(version = "10.0.0", jdk = "15")
@AppServer(version = "10.0.0", jdk = "15-openj9") @AppServer(version = "10.0.0", jdk = "15-openj9")
@AppServer(version = "11.0.1", jdk = "11")
@AppServer(version = "11.0.1", jdk = "11-openj9")
@AppServer(version = "11.0.1", jdk = "15")
@AppServer(version = "11.0.1", jdk = "15-openj9")
class JettySmokeTest extends AppServerTest { class JettySmokeTest extends AppServerTest {
protected String getTargetImagePrefix() { protected String getTargetImagePrefix() {

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
View File

@ -15,6 +15,10 @@ package io.opentelemetry.smoketest
@AppServer(version = "9.0.40", jdk = "8-openj9") @AppServer(version = "9.0.40", jdk = "8-openj9")
@AppServer(version = "9.0.40", jdk = "11") @AppServer(version = "9.0.40", jdk = "11")
@AppServer(version = "9.0.40", jdk = "11-openj9") @AppServer(version = "9.0.40", jdk = "11-openj9")
@AppServer(version = "10.0.4", jdk = "11")
@AppServer(version = "10.0.4", jdk = "11-openj9")
@AppServer(version = "10.0.4", jdk = "15")
@AppServer(version = "10.0.4", jdk = "15-openj9")
class TomcatSmokeTest extends AppServerTest { class TomcatSmokeTest extends AppServerTest {
protected String getTargetImagePrefix() { protected String getTargetImagePrefix() {