open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update tomcat smoke test to Java 17 (#4232) 

* Update tomcat smoke test to Java 17

* Update tomcat versions and add more java 17
This commit is contained in:
Trask Stalnaker 2021-09-28 20:19:59 -07:00 committed by GitHub
parent 4d57fc26b8
commit 1aa005c1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
smoke-tests/matrix/build.gradle
View File

@ -38,12 +38,14 @@ def linuxTargets = [
[version: ["11.0.1"], vm: ["openj9"], jdk: ["11", "16"], war: "servlet-5.0"]
],
"tomcat" : [
[version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"]],
[version: ["8.5.60", "9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]],
// TODO (trask) bump 15 to 16 (well, 17 very shortly)
// note: this requires some work since there is no tomcat image for 16-openj9
// and the hotspot image tag has changed naming convention
[version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15"], war: "servlet-5.0"]
[version: ["7.0.109"], vm: ["hotspot"], jdk: ["8"], args: [tagSuffix: ""]],
[version: ["7.0.109"], vm: ["openj9"], jdk: ["8"], args: [tagSuffix: "-adoptopenjdk-openj9"]],
[version: ["8.5.71", "9.0.53"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [tagSuffix: ""]],
// 8.5.70 and 9.0.52 are the latest tomcat images published with openj9 (and there's no jdk 17)
[version: ["8.5.70", "9.0.52"], vm: ["openj9"], jdk: ["8", "11"], args: [tagSuffix: "-adoptopenjdk-openj9"]],
[version: ["10.0.11"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [tagSuffix: ""], war: "servlet-5.0"],
// 10.0.8 is the latest tomcat image published with openj9 (and there's no jdk 17)
[version: ["10.0.8"], vm: ["openj9"], jdk: ["8", "11"], args: [tagSuffix: "-adoptopenjdk-openj9"], war: "servlet-5.0"]
],
"tomee" : [
[version: ["7.0.0"], vm: ["hotspot"], jdk: ["8"]],
@ -77,10 +79,13 @@ def windowsTargets = [
[version: ["11.0.1"], vm: ["openj9"], jdk: ["11", "16"], dockerfile: "jetty-split", args: [sourceVersion: "11.0.1"], war: "servlet-5.0"]
],
"tomcat" : [
[version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
[version: ["8.5.60"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
[version: ["9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
[version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15"], args: [majorVersion: "10"], war: "servlet-5.0"],
[version: ["7.0.109"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
[version: ["8.5.71"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "8"]],
[version: ["8.5.70"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
[version: ["9.0.53"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "9"]],
[version: ["9.0.52"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
[version: ["10.0.11"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "10"], war: "servlet-5.0"],
[version: ["10.0.8"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "10"], war: "servlet-5.0"]
],
"tomee" : [
[version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],

4
smoke-tests/matrix/src/tomcat.dockerfile
View File

@ -1,7 +1,7 @@
ARG version
ARG jdk
ARG vm
ARG tagSuffix
FROM tomcat:${version}-jdk${jdk}-adoptopenjdk-${vm}
FROM tomcat:${version}-jdk${jdk}${tagSuffix}
COPY app.war /usr/local/tomcat/webapps/