Skip to content

Commit 3a09178

Browse files
lauritlaurit
authored
Update smoke test servers (#10449)
1 parent ae95b29 commit 3a09178

File tree

9 files changed

+234
-215
lines changed

9 files changed

+234
-215
lines changed

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ abstract class AppServerTest extends SmokeTest {
5757
@Override
5858
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
5959
String platformSuffix = windows ? "-windows" : ""
60-
String extraTag = "20230822.5936895750"
60+
String extraTag = "20240209.7847080088"
6161
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
6262
return getTargetImagePrefix() + ":" + fullSuffix
6363
}
@@ -88,6 +88,10 @@ abstract class AppServerTest extends SmokeTest {
8888
true
8989
}
9090

91+
boolean testJsp() {
92+
true
93+
}
94+
9195
//TODO add assert that server spans were created by servers, not by servlets
9296
@Unroll
9397
def "#appServer smoke test on JDK #jdk"(String appServer, String jdk, boolean isWindows) {
@@ -373,6 +377,8 @@ abstract class AppServerTest extends SmokeTest {
373377

374378
@Unroll
375379
def "JSP smoke test for Snippet Injection"() {
380+
assumeTrue(testJsp())
381+
376382
when:
377383
def response = client().get("/app/jsp").aggregate().join()
378384
TraceInspector traces = new TraceInspector(waitForTraces())

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ abstract class JettyJpmsSmokeTest extends JettySmokeTest {
1515
}
1616
}
1717

18-
@AppServer(version = "11.0.15", jdk = "11")
18+
@AppServer(version = "11.0.19", jdk = "11")
1919
class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {
2020
}
21-
@AppServer(version = "11.0.15", jdk = "17")
21+
@AppServer(version = "11.0.19", jdk = "17")
2222
class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
2323
}
24-
@AppServer(version = "11.0.15", jdk = "20")
25-
class Jetty11JpmsJdk20 extends JettyJpmsSmokeTest {
26-
}
27-
@AppServer(version = "11.0.15", jdk = "21")
24+
@AppServer(version = "11.0.19", jdk = "21")
2825
class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {
2926
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -19,94 +19,82 @@ abstract class JettySmokeTest extends AppServerTest {
1919
}
2020
}
2121

22-
@AppServer(version = "9.4.51", jdk = "8")
22+
@AppServer(version = "9.4.53", jdk = "8")
2323
class Jetty9Jdk8 extends JettySmokeTest {
2424
}
2525

26-
@AppServer(version = "9.4.51", jdk = "11")
27-
class Jetty9Jdk11 extends JettySmokeTest {
26+
@AppServer(version = "9.4.53", jdk = "8-openj9")
27+
class Jetty9Jdk8Openj9 extends JettySmokeTest {
2828
}
2929

30-
@AppServer(version = "9.4.51", jdk = "17")
31-
class Jetty9Jdk17 extends JettySmokeTest {
30+
@AppServer(version = "9.4.53", jdk = "11")
31+
class Jetty9Jdk11 extends JettySmokeTest {
3232
}
3333

34-
@AppServer(version = "9.4.51", jdk = "20")
35-
class Jetty9Jdk20 extends JettySmokeTest {
34+
@AppServer(version = "9.4.53", jdk = "11-openj9")
35+
class Jetty9Jdk11Openj9 extends JettySmokeTest {
3636
}
3737

38-
@AppServer(version = "9.4.51", jdk = "21")
39-
class Jetty9Jdk21 extends JettySmokeTest {
38+
@AppServer(version = "9.4.53", jdk = "17")
39+
class Jetty9Jdk17 extends JettySmokeTest {
4040
}
4141

42-
@AppServer(version = "9.4.51", jdk = "8-openj9")
43-
class Jetty9Jdk8Openj9 extends JettySmokeTest {
42+
@AppServer(version = "9.4.53", jdk = "17-openj9")
43+
class Jetty9Jdk17Openj9 extends JettySmokeTest {
4444
}
4545

46-
@AppServer(version = "9.4.51", jdk = "11-openj9")
47-
class Jetty9Jdk11Openj9 extends JettySmokeTest {
46+
@AppServer(version = "9.4.53", jdk = "21")
47+
class Jetty9Jdk21 extends JettySmokeTest {
4848
}
4949

50-
@AppServer(version = "9.4.51", jdk = "17-openj9")
51-
class Jetty9Jdk17Openj9 extends JettySmokeTest {
50+
@AppServer(version = "9.4.53", jdk = "21-openj9")
51+
class Jetty9Jdk21Openj9 extends JettySmokeTest {
5252
}
5353

54-
@AppServer(version = "9.4.51", jdk = "18-openj9")
55-
class Jetty9Jdk18Openj9 extends JettySmokeTest {
54+
@AppServer(version = "10.0.19", jdk = "11")
55+
class Jetty10Jdk11 extends JettySmokeTest {
5656
}
5757

58-
@AppServer(version = "10.0.15", jdk = "11")
59-
class Jetty10Jdk11 extends JettySmokeTest {
58+
@AppServer(version = "10.0.19", jdk = "11-openj9")
59+
class Jetty10Jdk11Openj9 extends JettySmokeTest {
6060
}
6161

62-
@AppServer(version = "10.0.15", jdk = "17")
62+
@AppServer(version = "10.0.19", jdk = "17")
6363
class Jetty10Jdk17 extends JettySmokeTest {
6464
}
6565

66-
@AppServer(version = "10.0.15", jdk = "20")
67-
class Jetty10Jdk20 extends JettySmokeTest {
66+
@AppServer(version = "10.0.19", jdk = "17-openj9")
67+
class Jetty10Jdk17Openj9 extends JettySmokeTest {
6868
}
6969

70-
@AppServer(version = "10.0.15", jdk = "21")
70+
@AppServer(version = "10.0.19", jdk = "21")
7171
class Jetty10Jdk21 extends JettySmokeTest {
7272
}
7373

74-
@AppServer(version = "10.0.15", jdk = "11-openj9")
75-
class Jetty10Jdk11Openj9 extends JettySmokeTest {
76-
}
77-
78-
@AppServer(version = "10.0.15", jdk = "17-openj9")
79-
class Jetty10Jdk17Openj9 extends JettySmokeTest {
74+
@AppServer(version = "10.0.19", jdk = "21-openj9")
75+
class Jetty10Jdk21Openj9 extends JettySmokeTest {
8076
}
8177

82-
@AppServer(version = "10.0.15", jdk = "18-openj9")
83-
class Jetty10Jdk18Openj9 extends JettySmokeTest {
78+
@AppServer(version = "11.0.19", jdk = "11")
79+
class Jetty11Jdk11 extends JettySmokeTest {
8480
}
8581

86-
@AppServer(version = "11.0.15", jdk = "11")
87-
class Jetty11Jdk11 extends JettySmokeTest {
82+
@AppServer(version = "11.0.19", jdk = "11-openj9")
83+
class Jetty11Jdk11Openj9 extends JettySmokeTest {
8884
}
8985

90-
@AppServer(version = "11.0.15", jdk = "17")
86+
@AppServer(version = "11.0.19", jdk = "17")
9187
class Jetty11Jdk17 extends JettySmokeTest {
9288
}
9389

94-
@AppServer(version = "11.0.15", jdk = "20")
95-
class Jetty11Jdk20 extends JettySmokeTest {
90+
@AppServer(version = "11.0.19", jdk = "17-openj9")
91+
class Jetty11Jdk17Openj9 extends JettySmokeTest {
9692
}
9793

98-
@AppServer(version = "11.0.15", jdk = "21")
94+
@AppServer(version = "11.0.19", jdk = "21")
9995
class Jetty11Jdk21 extends JettySmokeTest {
10096
}
10197

102-
@AppServer(version = "11.0.15", jdk = "11-openj9")
103-
class Jetty11Jdk11Openj9 extends JettySmokeTest {
104-
}
105-
106-
@AppServer(version = "11.0.15", jdk = "17-openj9")
107-
class Jetty11Jdk17Openj9 extends JettySmokeTest {
108-
}
109-
110-
@AppServer(version = "11.0.15", jdk = "18-openj9")
111-
class Jetty11Jdk18Openj9 extends JettySmokeTest {
98+
@AppServer(version = "11.0.19", jdk = "21-openj9")
99+
class Jetty11Jdk21Openj9 extends JettySmokeTest {
112100
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertyServletOnlySmokeTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ class LibertyServletOnly21Jdk11 extends LibertySmokeTest {
3636
class LibertyServletOnly22Jdk11 extends LibertySmokeTest {
3737
}
3838

39-
@AppServer(version = "23.0.0.3", jdk = "11")
39+
@AppServer(version = "23.0.0.12", jdk = "11")
4040
class LibertyServletOnly23Jdk11 extends LibertySmokeTest {
4141
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LibertySmokeTest.groovy‎

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ class Liberty20Jdk11Openj9 extends LibertySmokeTest {
3939
class Liberty21Jdk8 extends LibertySmokeTest {
4040
}
4141

42-
@AppServer(version = "21.0.0.12", jdk = "11")
43-
class Liberty21Jdk11 extends LibertySmokeTest {
44-
}
45-
46-
@AppServer(version = "21.0.0.12", jdk = "17")
47-
class Liberty21Jdk17 extends LibertySmokeTest {
48-
}
49-
5042
@AppServer(version = "21.0.0.12", jdk = "8-openj9")
5143
class Liberty21Jdk8Openj9 extends LibertySmokeTest {
5244
}
5345

46+
@AppServer(version = "21.0.0.12", jdk = "11")
47+
class Liberty21Jdk11 extends LibertySmokeTest {
48+
}
49+
5450
@AppServer(version = "21.0.0.12", jdk = "11-openj9")
5551
class Liberty21Jdk11Openj9 extends LibertySmokeTest {
5652
}
5753

54+
@AppServer(version = "21.0.0.12", jdk = "17")
55+
class Liberty21Jdk17 extends LibertySmokeTest {
56+
}
57+
5858
@AppServer(version = "21.0.0.12", jdk = "17-openj9")
5959
class Liberty21Jdk17Openj9 extends LibertySmokeTest {
6060
}
@@ -63,54 +63,62 @@ class Liberty21Jdk17Openj9 extends LibertySmokeTest {
6363
class Liberty22Jdk8 extends LibertySmokeTest {
6464
}
6565

66-
@AppServer(version = "22.0.0.12", jdk = "11")
67-
class Liberty22Jdk11 extends LibertySmokeTest {
68-
}
69-
70-
@AppServer(version = "22.0.0.12", jdk = "17")
71-
class Liberty22Jdk17 extends LibertySmokeTest {
72-
}
73-
74-
@AppServer(version = "22.0.0.12", jdk = "20")
75-
class Liberty22Jdk20 extends LibertySmokeTest {
76-
}
77-
7866
@AppServer(version = "22.0.0.12", jdk = "8-openj9")
7967
class Liberty22Jdk8Openj9 extends LibertySmokeTest {
8068
}
8169

70+
@AppServer(version = "22.0.0.12", jdk = "11")
71+
class Liberty22Jdk11 extends LibertySmokeTest {
72+
}
73+
8274
@AppServer(version = "22.0.0.12", jdk = "11-openj9")
8375
class Liberty22Jdk11Openj9 extends LibertySmokeTest {
8476
}
8577

78+
@AppServer(version = "22.0.0.12", jdk = "17")
79+
class Liberty22Jdk17 extends LibertySmokeTest {
80+
}
81+
8682
@AppServer(version = "22.0.0.12", jdk = "17-openj9")
8783
class Liberty22Jdk17Openj9 extends LibertySmokeTest {
8884
}
8985

90-
@AppServer(version = "23.0.0.3", jdk = "8")
86+
@AppServer(version = "23.0.0.12", jdk = "8")
9187
class Liberty23Jdk8 extends LibertySmokeTest {
88+
@Override
89+
boolean testJsp() {
90+
false
91+
}
9292
}
9393

94-
@AppServer(version = "23.0.0.3", jdk = "11")
94+
@AppServer(version = "23.0.0.12", jdk = "8-openj9")
95+
class Liberty23Jdk8Openj9 extends LibertySmokeTest {
96+
@Override
97+
boolean testJsp() {
98+
false
99+
}
100+
}
101+
102+
@AppServer(version = "23.0.0.12", jdk = "11")
95103
class Liberty23Jdk11 extends LibertySmokeTest {
96104
}
97105

98-
@AppServer(version = "23.0.0.3", jdk = "17")
99-
class Liberty23Jdk17 extends LibertySmokeTest {
106+
@AppServer(version = "23.0.0.12", jdk = "11-openj9")
107+
class Liberty23Jdk11Openj9 extends LibertySmokeTest {
100108
}
101109

102-
@AppServer(version = "23.0.0.3", jdk = "20")
103-
class Liberty23Jdk20 extends LibertySmokeTest {
110+
@AppServer(version = "23.0.0.12", jdk = "17")
111+
class Liberty23Jdk17 extends LibertySmokeTest {
104112
}
105113

106-
@AppServer(version = "23.0.0.3", jdk = "8-openj9")
107-
class Liberty23Jdk8Openj9 extends LibertySmokeTest {
114+
@AppServer(version = "23.0.0.12", jdk = "17-openj9")
115+
class Liberty23Jdk17Openj9 extends LibertySmokeTest {
108116
}
109117

110-
@AppServer(version = "23.0.0.3", jdk = "11-openj9")
111-
class Liberty23Jdk11Openj9 extends LibertySmokeTest {
118+
@AppServer(version = "23.0.0.12", jdk = "20")
119+
class Liberty23Jdk20 extends LibertySmokeTest {
112120
}
113121

114-
@AppServer(version = "23.0.0.3", jdk = "17-openj9")
115-
class Liberty23Jdk17Openj9 extends LibertySmokeTest {
122+
@AppServer(version = "23.0.0.12", jdk = "20-openj9")
123+
class Liberty23Jdk20Openj9 extends LibertySmokeTest {
116124
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PayaraSmokeTest.groovy‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ abstract class PayaraSmokeTest extends AppServerTest {
4242
class Payara52020Jdk8 extends PayaraSmokeTest {
4343
}
4444

45-
@AppServer(version = "5.2020.6", jdk = "11")
46-
class Payara52020Jdk11 extends PayaraSmokeTest {
47-
}
48-
4945
@AppServer(version = "5.2020.6", jdk = "8-openj9")
5046
class Payara52020Jdk8Openj9 extends PayaraSmokeTest {
5147
}
5248

49+
@AppServer(version = "5.2020.6", jdk = "11")
50+
class Payara52020Jdk11 extends PayaraSmokeTest {
51+
}
52+
5353
@AppServer(version = "5.2020.6", jdk = "11-openj9")
5454
class Payara52020Jdk11Openj9 extends PayaraSmokeTest {
5555
}
@@ -58,30 +58,34 @@ class Payara52020Jdk11Openj9 extends PayaraSmokeTest {
5858
class Payara52021Jdk8 extends PayaraSmokeTest {
5959
}
6060

61-
@AppServer(version = "5.2021.8", jdk = "11")
62-
class Payara52021Jdk11 extends PayaraSmokeTest {
63-
}
64-
6561
@AppServer(version = "5.2021.8", jdk = "8-openj9")
6662
class Payara52021Jdk8Openj9 extends PayaraSmokeTest {
6763
}
6864

65+
@AppServer(version = "5.2021.8", jdk = "11")
66+
class Payara52021Jdk11 extends PayaraSmokeTest {
67+
}
68+
6969
@AppServer(version = "5.2021.8", jdk = "11-openj9")
7070
class Payara52021Jdk11Openj9 extends PayaraSmokeTest {
7171
}
7272

73-
@AppServer(version = "6.2023.4", jdk = "11")
73+
@AppServer(version = "6.2023.12", jdk = "11")
7474
class Payara6Jdk11 extends PayaraSmokeTest {
7575
}
7676

77-
@AppServer(version = "6.2023.4", jdk = "11-openj9")
77+
@AppServer(version = "6.2023.12", jdk = "11-openj9")
7878
class Payara6Jdk11Openj9 extends PayaraSmokeTest {
7979
}
8080

81-
@AppServer(version = "6.2023.4", jdk = "17")
81+
@AppServer(version = "6.2023.12", jdk = "17")
8282
class Payara6Jdk17 extends PayaraSmokeTest {
8383
}
8484

85-
@AppServer(version = "6.2023.4", jdk = "17-openj9")
85+
@AppServer(version = "6.2023.12", jdk = "17-openj9")
8686
class Payara6Jdk17Openj9 extends PayaraSmokeTest {
8787
}
88+
89+
@AppServer(version = "6.2023.12", jdk = "21-openj9")
90+
class Payara6Jdk21Openj9 extends PayaraSmokeTest {
91+
}

0 commit comments

Comments
 (0)