From 248391c583629f390fd03eb58999d7fbdeb41c9d Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 11 Aug 2025 21:42:35 +0300 Subject: [PATCH] Print smoke test configuration only when requested --- smoke-tests/images/servlet/build.gradle.kts | 34 +++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts index fe0165d2dc0a..a8d7627a0bd7 100644 --- a/smoke-tests/images/servlet/build.gradle.kts +++ b/smoke-tests/images/servlet/build.gradle.kts @@ -98,22 +98,24 @@ tasks { createDockerTasks(buildWindowsTestImages, true) val printSmokeTestsConfigurations by registering { - for ((server, matrices) in targets) { - val smokeTestServer = findProperty("smokeTestServer") - if (smokeTestServer != null && server != smokeTestServer) { - continue - } - println(server) - val serverName = StringUtils.capitalize(server) - for (entry in matrices) { - for (version in entry.version) { - val dotIndex = version.indexOf('.') - val majorVersion = if (dotIndex != -1) version.substring(0, dotIndex) else version - for (jdk in entry.jdk) { - for (vm in entry.vm) { - println("@AppServer(version = \"$version\", jdk = \"$jdk${if (vm == "hotspot") "" else "-openj9"}\")") - println("class ${serverName}${majorVersion}Jdk${jdk}${if (vm == "hotspot") "" else "Openj9"} extends ${serverName}SmokeTest {") - println("}") + doFirst { + for ((server, matrices) in targets) { + val smokeTestServer = findProperty("smokeTestServer") + if (smokeTestServer != null && server != smokeTestServer) { + continue + } + println(server) + val serverName = StringUtils.capitalize(server) + for (entry in matrices) { + for (version in entry.version) { + val dotIndex = version.indexOf('.') + val majorVersion = if (dotIndex != -1) version.substring(0, dotIndex) else version + for (jdk in entry.jdk) { + for (vm in entry.vm) { + println("@AppServer(version = \"$version\", jdk = \"$jdk${if (vm == "hotspot") "" else "-openj9"}\")") + println("class ${serverName}${majorVersion}Jdk${jdk}${if (vm == "hotspot") "" else "Openj9"} extends ${serverName}SmokeTest {") + println("}") + } } } }