Skip to content

Commit 62cc2a7

Browse files
iNikemiNikem
authored
Use new smoke test images (#4439)
1 parent 6dd6592 commit 62cc2a7

File tree

5 files changed

+57
-28
lines changed

5 files changed

+57
-28
lines changed

‎smoke-tests/images/servlet/build.gradle

+19
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,25 @@ def targets = [
6868
]
6969
]
7070

71+
tasks.register("printSmokeTestsConfigurations") {
72+
linuxTargets.each { server, matrices ->
73+
def smokeTestServer = findProperty('smokeTestServer')
74+
if (smokeTestServer != null && server != smokeTestServer) {
75+
return
76+
}
77+
println server
78+
matrices.forEach { entry ->
79+
entry.version.forEach { version ->
80+
entry.jdk.forEach { jdk ->
81+
entry.vm.forEach { vm ->
82+
println "@AppServer(version = \"$version\", jdk = \"$jdk${vm == 'hotspot' ? '' : '-openj9'}\")"
83+
}
84+
}
85+
}
86+
}
87+
}
88+
}
89+
7190
createDockerTasks(buildLinuxTestImagesTask, targets, false)
7291
createDockerTasks(buildWindowsTestImagesTask, targets, true)
7392

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ abstract class AppServerTest extends SmokeTest {
4545
@Override
4646
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
4747
String platformSuffix = windows ? "-windows" : ""
48-
String extraTag = "20210929.1285231297"
48+
String extraTag = "20211020.1362390004"
4949
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
5050
return getTargetImagePrefix() + ":" + fullSuffix
5151
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55

66
package io.opentelemetry.smoketest
77

8-
@AppServer(version = "9.4.35", jdk = "8")
9-
@AppServer(version = "9.4.35", jdk = "8-openj9")
10-
@AppServer(version = "9.4.35", jdk = "11")
11-
@AppServer(version = "9.4.35", jdk = "11-openj9")
12-
@AppServer(version = "9.4.35", jdk = "16")
13-
@AppServer(version = "9.4.35", jdk = "16-openj9")
14-
@AppServer(version = "10.0.0", jdk = "11")
15-
@AppServer(version = "10.0.0", jdk = "11-openj9")
16-
@AppServer(version = "10.0.0", jdk = "16")
17-
@AppServer(version = "10.0.0", jdk = "16-openj9")
18-
@AppServer(version = "11.0.1", jdk = "11")
19-
@AppServer(version = "11.0.1", jdk = "11-openj9")
20-
@AppServer(version = "11.0.1", jdk = "16")
21-
@AppServer(version = "11.0.1", jdk = "16-openj9")
8+
@AppServer(version = "9.4.39", jdk = "8")
9+
@AppServer(version = "9.4.39", jdk = "8-openj9")
10+
@AppServer(version = "9.4.39", jdk = "11")
11+
@AppServer(version = "9.4.39", jdk = "11-openj9")
12+
@AppServer(version = "9.4.39", jdk = "17")
13+
@AppServer(version = "9.4.39", jdk = "16-openj9")
14+
@AppServer(version = "10.0.7", jdk = "11")
15+
@AppServer(version = "10.0.7", jdk = "11-openj9")
16+
@AppServer(version = "10.0.7", jdk = "17")
17+
@AppServer(version = "10.0.7", jdk = "16-openj9")
18+
@AppServer(version = "11.0.7", jdk = "11")
19+
@AppServer(version = "11.0.7", jdk = "11-openj9")
20+
@AppServer(version = "11.0.7", jdk = "17")
21+
@AppServer(version = "11.0.7", jdk = "16-openj9")
2222
class JettySmokeTest extends AppServerTest {
2323

2424
protected String getTargetImagePrefix() {

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ package io.opentelemetry.smoketest
88
@AppServer(version = "7.0.109", jdk = "8")
99
@AppServer(version = "7.0.109", jdk = "8-openj9")
1010
@AppServer(version = "8.5.71", jdk = "8")
11+
@AppServer(version = "8.5.71", jdk = "8-openj9")
1112
@AppServer(version = "8.5.71", jdk = "11")
13+
@AppServer(version = "8.5.71", jdk = "11-openj9")
1214
@AppServer(version = "8.5.71", jdk = "17")
13-
@AppServer(version = "8.5.70", jdk = "8-openj9")
14-
@AppServer(version = "8.5.70", jdk = "11-openj9")
1515
@AppServer(version = "9.0.53", jdk = "8")
16+
@AppServer(version = "9.0.53", jdk = "8-openj9")
1617
@AppServer(version = "9.0.53", jdk = "11")
18+
@AppServer(version = "9.0.53", jdk = "11-openj9")
1719
@AppServer(version = "9.0.53", jdk = "17")
18-
@AppServer(version = "9.0.52", jdk = "8-openj9")
19-
@AppServer(version = "9.0.52", jdk = "11-openj9")
20-
// TODO (trask) there are Tomcat 10 images for Java 8 (both hotspot and openj9)
21-
// but smoke tests are currently failing on them
20+
@AppServer(version = "10.0.11", jdk = "8")
21+
@AppServer(version = "10.0.11", jdk = "8-openj9")
2222
@AppServer(version = "10.0.11", jdk = "11")
23+
@AppServer(version = "10.0.11", jdk = "11-openj9")
2324
@AppServer(version = "10.0.11", jdk = "17")
24-
@AppServer(version = "10.0.8", jdk = "11-openj9")
2525
class TomcatSmokeTest extends AppServerTest {
2626

2727
protected String getTargetImagePrefix() {

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy

+16-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,22 @@ package io.opentelemetry.smoketest
77

88
import java.time.Duration
99

10-
@AppServer(version = "7.0.0", jdk = "8")
11-
@AppServer(version = "7.0.0", jdk = "8-openj9")
12-
@AppServer(version = "8.0.6", jdk = "8")
13-
@AppServer(version = "8.0.6", jdk = "8-openj9")
14-
@AppServer(version = "8.0.6", jdk = "11")
15-
@AppServer(version = "8.0.6", jdk = "11-openj9")
10+
@AppServer(version = "7.0.9", jdk = "8")
11+
@AppServer(version = "7.0.9", jdk = "8-openj9")
12+
@AppServer(version = "7.1.4", jdk = "8")
13+
@AppServer(version = "7.1.4", jdk = "8-openj9")
14+
@AppServer(version = "8.0.8", jdk = "8")
15+
@AppServer(version = "8.0.8", jdk = "8-openj9")
16+
@AppServer(version = "8.0.8", jdk = "11")
17+
@AppServer(version = "8.0.8", jdk = "11-openj9")
18+
@AppServer(version = "8.0.8", jdk = "17")
19+
@AppServer(version = "8.0.8", jdk = "16-openj9")
20+
@AppServer(version = "9.0.0-M7", jdk = "8")
21+
@AppServer(version = "9.0.0-M7", jdk = "8-openj9")
22+
@AppServer(version = "9.0.0-M7", jdk = "11")
23+
@AppServer(version = "9.0.0-M7", jdk = "11-openj9")
24+
@AppServer(version = "9.0.0-M7", jdk = "17")
25+
@AppServer(version = "9.0.0-M7", jdk = "16-openj9")
1626
class TomeeSmokeTest extends AppServerTest {
1727

1828
protected String getTargetImagePrefix() {

0 commit comments

Comments
 (0)