Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OpenJ9 image smoke test configurations #2386

Merged
merged 1 commit into from Feb 23, 2021
Merged

Add OpenJ9 image smoke test configurations #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GlassFishSmokeTest.groovy
View file
Open in desktop
Expand Up @@ -11,11 +11,13 @@ import org.testcontainers.containers.wait.strategy.Wait
import org.testcontainers.containers.wait.strategy.WaitStrategy

@AppServer(version = "5.2020.6", jdk = "8")
@AppServer(version = "5.2020.6-jdk11", jdk = "11")
@AppServer(version = "5.2020.6", jdk = "8-openj9")
@AppServer(version = "5.2020.6", jdk = "11")
@AppServer(version = "5.2020.6", jdk = "11-openj9")
class GlassFishSmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:payara-${serverVersion}-jdk$jdk-20201215.422527843"
"ghcr.io/open-telemetry/java-test-containers:payara-${serverVersion}-jdk$jdk-20210223.592806654"
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
View file
Open in desktop
Expand Up @@ -6,13 +6,17 @@
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 = "10.0.0", jdk = "11")
@AppServer(version = "10.0.0", jdk = "11-openj9")
@AppServer(version = "10.0.0", jdk = "15")
@AppServer(version = "10.0.0", jdk = "15-openj9")
class JettySmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:jetty-${serverVersion}-jdk$jdk-20201215.422527843"
"ghcr.io/open-telemetry/java-test-containers:jetty-${serverVersion}-jdk$jdk-20210223.592806654"
}

def getJettySpanName() {
Expand Down
6 changes: 3 additions & 3 deletions smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy
View file
Open in desktop
Expand Up @@ -10,13 +10,13 @@ import org.testcontainers.containers.wait.strategy.Wait
import org.testcontainers.containers.wait.strategy.WaitStrategy

@AppServer(version = "20.0.0.12", jdk = "8")
@AppServer(version = "20.0.0.12", jdk = "8-openj9")
@AppServer(version = "20.0.0.12", jdk = "11")
@AppServer(version = "20.0.0.12", jdk = "8-jdk-openj9")
@AppServer(version = "20.0.0.12", jdk = "11-jdk-openj9")
@AppServer(version = "20.0.0.12", jdk = "11-openj9")
class LibertySmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:liberty-${serverVersion}-jdk$jdk-20201215.422527843"
"ghcr.io/open-telemetry/java-test-containers:liberty-${serverVersion}-jdk$jdk-20210223.592806654"
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
View file
Open in desktop
Expand Up @@ -6,14 +6,19 @@
package io.opentelemetry.smoketest

@AppServer(version = "7.0.107", jdk = "8")
@AppServer(version = "7.0.107", jdk = "8-openj9")
@AppServer(version = "8.5.60", jdk = "8")
@AppServer(version = "8.5.60", jdk = "8-openj9")
@AppServer(version = "8.5.60", jdk = "11")
@AppServer(version = "8.5.60", jdk = "11-openj9")
@AppServer(version = "9.0.40", jdk = "8")
@AppServer(version = "9.0.40", jdk = "8-openj9")
@AppServer(version = "9.0.40", jdk = "11")
@AppServer(version = "9.0.40", jdk = "11-openj9")
class TomcatSmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:tomcat-${serverVersion}-jdk$jdk-20201215.422527843"
"ghcr.io/open-telemetry/java-test-containers:tomcat-${serverVersion}-jdk$jdk-20210223.592806654"
}

@Override
Expand Down
5 changes: 4 additions & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
View file
Open in desktop
Expand Up @@ -10,12 +10,15 @@ import org.testcontainers.containers.wait.strategy.Wait
import org.testcontainers.containers.wait.strategy.WaitStrategy

@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")
class TomeeSmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:tomee-${serverVersion}-jdk$jdk-20210202.531569197"
"ghcr.io/open-telemetry/java-test-containers:tomee-${serverVersion}-jdk$jdk-20210223.592806654"
}

@Override
Expand Down
5 changes: 4 additions & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy
View file
Open in desktop
Expand Up @@ -10,12 +10,15 @@ import okhttp3.Request
import spock.lang.Unroll

@AppServer(version = "13.0.0.Final", jdk = "8")
@AppServer(version = "13.0.0.Final", jdk = "8-openj9")
@AppServer(version = "17.0.1.Final", jdk = "11")
@AppServer(version = "17.0.1.Final", jdk = "11-openj9")
@AppServer(version = "21.0.0.Final", jdk = "11")
@AppServer(version = "21.0.0.Final", jdk = "11-openj9")
class WildflySmokeTest extends AppServerTest {

protected String getTargetImage(String jdk, String serverVersion) {
"ghcr.io/open-telemetry/java-test-containers:wildfly-${serverVersion}-jdk$jdk-20201215.422527843"
"ghcr.io/open-telemetry/java-test-containers:wildfly-${serverVersion}-jdk$jdk-20210223.592806654"
}

@Override
Expand Down