Skip to content

Commit 6dd6592

Browse files
authored
Unify images configuration for smoke test matrix build (#4437)
1 parent 2c7ff5e commit 6dd6592

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

smoke-tests/images/servlet/build.gradle

+3-19
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks.create("pushMatrix", DockerPushImage) {
2828

2929
// Each line under appserver describes one matrix of (version x vm x jdk), dockerfile key overrides
3030
// Dockerfile name, args key passes raw arguments to docker build
31-
def linuxTargets = [
31+
def targets = [
3232
"jetty" : [
3333
[version: ["9.4.39"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [sourceVersion: "9.4.39.v20210325"]],
3434
[version: ["9.4.39"], vm: ["openj9"], jdk: ["8", "11", "16"], args: [sourceVersion: "9.4.39.v20210325"]],
@@ -60,32 +60,16 @@ def linuxTargets = [
6060
"wildfly": [
6161
[version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
6262
[version: ["17.0.1.Final", "21.0.0.Final"], vm: ["hotspot"], jdk: ["8", "11", "17"]],
63-
// there's no openj9 image for jdk 17
6463
[version: ["17.0.1.Final", "21.0.0.Final"], vm: ["openj9"], jdk: ["8", "11", "16"]]
6564
],
6665
"liberty": [
6766
// running configure.sh is failing while building the image with Java 17
68-
[version: ["20.0.0.12"], vm: ["hotspot", "openj9"], jdk: ["8", "11", "16"]]
69-
]
70-
]
71-
72-
def windowsTargets = [
73-
"jetty" : linuxTargets["jetty"],
74-
"tomcat" : linuxTargets["tomcat"],
75-
"tomee" : linuxTargets["tomee"],
76-
"payara" : linuxTargets["payara"],
77-
"wildfly": [
78-
[version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
79-
[version: ["17.0.1.Final", "21.0.0.Final"], vm: ["hotspot"], jdk: ["8", "11", "17"]],
80-
[version: ["17.0.1.Final", "21.0.0.Final"], vm: ["openj9"], jdk: ["8", "11", "16"]]
81-
],
82-
"liberty": [
8367
[version: ["20.0.0.12"], vm: ["hotspot", "openj9"], jdk: ["8", "11", "16"], args: [release: "2020-11-11_0736"]]
8468
]
8569
]
8670

87-
createDockerTasks(buildLinuxTestImagesTask, linuxTargets, false)
88-
createDockerTasks(buildWindowsTestImagesTask, windowsTargets, true)
71+
createDockerTasks(buildLinuxTestImagesTask, targets, false)
72+
createDockerTasks(buildWindowsTestImagesTask, targets, true)
8973

9074
def configureImage(Task parentTask, server, dockerfile, version, vm, jdk, warProject, Map<String, String> extraArgs, boolean isWindows, String extraTag) {
9175
// Using separate build directory for different war files allows using the same app.war filename

0 commit comments

Comments
 (0)