Skip to content

Commit

Permalink
Use new smoke test images (#4439)
Browse files Browse the repository at this point in the history
  • Loading branch information
@iNikem
iNikem authored Oct 20, 2021
1 parent 6dd6592 commit 62cc2a7
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 28 deletions.
19 changes: 19 additions & 0 deletions smoke-tests/images/servlet/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
28 changes: 14 additions & 14 deletions smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
14 changes: 7 additions & 7 deletions smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
22 changes: 16 additions & 6 deletions smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 62cc2a7

Please sign in to comment.