Fix Tomcat windows smoke test images
MODIFY
smoke-tests/matrix/build.gradle
smoke-tests/matrix/build.gradle
@@ -68,11 +68,14 @@ def windowsTargets = [
[version: ["11.0.1"], vm: ["hotspot", "openj9"], jdk: ["11", "15", "16"], dockerfile: "jetty-split", args: [sourceVersion: "11.0.1"], war: "servlet-5.0"]
],
"tomcat" : [
- [version: ["7.0.107"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8"], args: [majorVersion: "7"]],
- [version: ["8.5.60"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
- [version: ["9.0.40"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
- [version: ["10.0.4"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["11", "15"], args: [majorVersion: "10"], war: "servlet-5.0"],
- [version: ["10.0.4"], vm: ["openjdk"], jdk: ["16"], args: [majorVersion: "10"], war: "servlet-5.0"]
+ [version: ["7.0.107"], vm: ["openjdk"], jdk: ["8"], args: [majorVersion: "7"]],
+ [version: ["8.5.60"], vm: ["openjdk"], jdk: ["8", "11"], args: [majorVersion: "8"]],
+ [version: ["9.0.40"], vm: ["openjdk"], jdk: ["8", "11"], args: [majorVersion: "9"]],
+ [version: ["10.0.4"], vm: ["openjdk"], jdk: ["11", "15", "16"], args: [majorVersion: "10"], war: "servlet-5.0"],
+ [version: ["7.0.107"], vm: ["adoptopenjdk"], jdk: ["8-jdk-openj9"], args: [majorVersion: "7"]],
+ [version: ["8.5.60"], vm: ["adoptopenjdk"], jdk: ["8-jdk-openj9", "11-jdk-openj9"], args: [majorVersion: "8"]],
+ [version: ["9.0.40"], vm: ["adoptopenjdk"], jdk: ["8-jdk-openj9", "11-jdk-openj9"], args: [majorVersion: "9"]],
+ [version: ["10.0.4"], vm: ["adoptopenjdk"], jdk: ["11-jdk-openj9", "15-jdk-openj9"], args: [majorVersion: "10"], war: "servlet-5.0"]
],
"tomee" : [
[version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],

MODIFY
smoke-tests/matrix/src/tomcat.windows.dockerfile
smoke-tests/matrix/src/tomcat.windows.dockerfile
@@ -10,7 +10,7 @@ ARG version
ADD https://archive.apache.org/dist/tomcat/tomcat-${majorVersion}/v${version}/bin/apache-tomcat-${version}-windows-x64.zip /server.zip
RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
-FROM adoptopenjdk:${jdk}-jdk-${vm}-windowsservercore-1809
+FROM ${vm}:${jdk}-windowsservercore-1809
ARG version
# Make /server the base directory to simplify all further paths
COPY --from=builder /server/apache-tomcat-${version} /server

Fix Tomcat windows smoke test images (#3469)