Skip to content

Commit a62eee6

Browse files
authored
Print smoke test configuration only when requested (#14408)
1 parent 28d7b15 commit a62eee6

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,24 @@ tasks {
9898
createDockerTasks(buildWindowsTestImages, true)
9999

100100
val printSmokeTestsConfigurations by registering {
101-
for ((server, matrices) in targets) {
102-
val smokeTestServer = findProperty("smokeTestServer")
103-
if (smokeTestServer != null && server != smokeTestServer) {
104-
continue
105-
}
106-
println(server)
107-
val serverName = StringUtils.capitalize(server)
108-
for (entry in matrices) {
109-
for (version in entry.version) {
110-
val dotIndex = version.indexOf('.')
111-
val majorVersion = if (dotIndex != -1) version.substring(0, dotIndex) else version
112-
for (jdk in entry.jdk) {
113-
for (vm in entry.vm) {
114-
println("@AppServer(version = \"$version\", jdk = \"$jdk${if (vm == "hotspot") "" else "-openj9"}\")")
115-
println("class ${serverName}${majorVersion}Jdk${jdk}${if (vm == "hotspot") "" else "Openj9"} extends ${serverName}SmokeTest {")
116-
println("}")
101+
doFirst {
102+
for ((server, matrices) in targets) {
103+
val smokeTestServer = findProperty("smokeTestServer")
104+
if (smokeTestServer != null && server != smokeTestServer) {
105+
continue
106+
}
107+
println(server)
108+
val serverName = StringUtils.capitalize(server)
109+
for (entry in matrices) {
110+
for (version in entry.version) {
111+
val dotIndex = version.indexOf('.')
112+
val majorVersion = if (dotIndex != -1) version.substring(0, dotIndex) else version
113+
for (jdk in entry.jdk) {
114+
for (vm in entry.vm) {
115+
println("@AppServer(version = \"$version\", jdk = \"$jdk${if (vm == "hotspot") "" else "-openj9"}\")")
116+
println("class ${serverName}${majorVersion}Jdk${jdk}${if (vm == "hotspot") "" else "Openj9"} extends ${serverName}SmokeTest {")
117+
println("}")
118+
}
117119
}
118120
}
119121
}

0 commit comments

Comments
 (0)