Skip to content

Commit ee781f5

Browse files
fmhwongfmhwong
authored
Update Liberty versions (open-telemetry#7857)
Open Liberty version 20.0.0.x are out of support. This PR removes 20.0.0.x and adds 22.0.0.x.
1 parent 7e05d32 commit ee781f5

File tree

5 files changed

+40
-28
lines changed

5 files changed

+40
-28
lines changed

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ These are the application servers that the smoke tests are run against:
164164
| [Tomcat](http://tomcat.apache.org/) | 7.0.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
165165
| [Tomcat](http://tomcat.apache.org/) | 7.0.x, 8.5.x, 9.0.x, 10.0.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
166166
| [TomEE](https://tomee.apache.org/) | 7.x, 8.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
167-
| [Open Liberty](https://openliberty.io/) | 20.x, 21.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
167+
| [Open Liberty](https://openliberty.io/) | 21.x, 22.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
168168
| [Websphere Traditional](https://www.ibm.com/uk-en/cloud/websphere-application-server) | 8.5.5.x, 9.0.x | IBM JDK 8 | Red Hat Enterprise Linux 8.4 |
169169
| [WildFly](https://www.wildfly.org/) | 13.x | OpenJDK 8 | [`ubuntu-latest`], [`windows-latest`] |
170170
| [WildFly](https://www.wildfly.org/) | 17.x, 21.x, 25.x | OpenJDK 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ abstract class AppServerTest extends SmokeTest {
5454
@Override
5555
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
5656
String platformSuffix = windows ? "-windows" : ""
57-
String extraTag = "20221129.3575751672"
57+
String extraTag = "20230301.4309128636"
5858
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
5959
return getTargetImagePrefix() + ":" + fullSuffix
6060
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ abstract class LibertyServletOnlySmokeTest extends LibertySmokeTest {
2828
}
2929
}
3030

31-
@AppServer(version = "20.0.0.12", jdk = "11")
32-
class LibertyServletOnly20Jdk11 extends LibertySmokeTest {
31+
@AppServer(version = "21.0.0.12", jdk = "11")
32+
class LibertyServletOnly21Jdk11 extends LibertySmokeTest {
3333
}
3434

35-
@AppServer(version = "21.0.0.10", jdk = "11")
36-
class LibertyServletOnly21Jdk11 extends LibertySmokeTest {
35+
@AppServer(version = "22.0.0.12", jdk = "11")
36+
class LibertyServletOnly22Jdk11 extends LibertySmokeTest {
3737
}

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

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,54 @@ abstract class LibertySmokeTest extends AppServerTest {
1919
}
2020
}
2121

22-
@AppServer(version = "20.0.0.12", jdk = "8")
23-
class Liberty20Jdk8 extends LibertySmokeTest {
22+
@AppServer(version = "21.0.0.12", jdk = "8")
23+
class Liberty21Jdk8 extends LibertySmokeTest {
2424
}
2525

26-
@AppServer(version = "20.0.0.12", jdk = "11")
27-
class Liberty20Jdk11 extends LibertySmokeTest {
26+
@AppServer(version = "21.0.0.12", jdk = "11")
27+
class Liberty21Jdk11 extends LibertySmokeTest {
2828
}
2929

30-
@AppServer(version = "20.0.0.12", jdk = "8-openj9")
31-
class Liberty20Jdk8Openj9 extends LibertySmokeTest {
30+
@AppServer(version = "21.0.0.12", jdk = "17")
31+
class Liberty21Jdk17 extends LibertySmokeTest {
3232
}
3333

34-
@AppServer(version = "20.0.0.12", jdk = "11-openj9")
35-
class Liberty20Jdk11Openj9 extends LibertySmokeTest {
34+
@AppServer(version = "21.0.0.12", jdk = "8-openj9")
35+
class Liberty21Jdk8Openj9 extends LibertySmokeTest {
3636
}
3737

38-
@AppServer(version = "21.0.0.10", jdk = "8")
39-
class Liberty21Jdk8 extends LibertySmokeTest {
38+
@AppServer(version = "21.0.0.12", jdk = "11-openj9")
39+
class Liberty21Jdk11Openj9 extends LibertySmokeTest {
4040
}
4141

42-
@AppServer(version = "21.0.0.10", jdk = "11")
43-
class Liberty21Jdk11 extends LibertySmokeTest {
42+
@AppServer(version = "21.0.0.12", jdk = "17-openj9")
43+
class Liberty21Jdk17Openj9 extends LibertySmokeTest {
4444
}
4545

46-
@AppServer(version = "21.0.0.10", jdk = "17")
47-
class Liberty21Jdk17 extends LibertySmokeTest {
46+
@AppServer(version = "22.0.0.12", jdk = "8")
47+
class Liberty22Jdk8 extends LibertySmokeTest {
4848
}
4949

50-
@AppServer(version = "21.0.0.10", jdk = "8-openj9")
51-
class Liberty21Jdk8Openj9 extends LibertySmokeTest {
50+
@AppServer(version = "22.0.0.12", jdk = "11")
51+
class Liberty22Jdk11 extends LibertySmokeTest {
5252
}
5353

54-
@AppServer(version = "21.0.0.10", jdk = "11-openj9")
55-
class Liberty21Jdk11Openj9 extends LibertySmokeTest {
54+
@AppServer(version = "22.0.0.12", jdk = "17")
55+
class Liberty22Jdk17 extends LibertySmokeTest {
5656
}
5757

58-
@AppServer(version = "21.0.0.10", jdk = "17-openj9")
59-
class Liberty21Jdk17Openj9 extends LibertySmokeTest {
58+
@AppServer(version = "22.0.0.12", jdk = "19")
59+
class Liberty22Jdk19 extends LibertySmokeTest {
60+
}
61+
62+
@AppServer(version = "22.0.0.12", jdk = "8-openj9")
63+
class Liberty22Jdk8Openj9 extends LibertySmokeTest {
64+
}
65+
66+
@AppServer(version = "22.0.0.12", jdk = "11-openj9")
67+
class Liberty22Jdk11Openj9 extends LibertySmokeTest {
68+
}
69+
70+
@AppServer(version = "22.0.0.12", jdk = "17-openj9")
71+
class Liberty22Jdk17Openj9 extends LibertySmokeTest {
6072
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ abstract class WebsphereSmokeTest extends AppServerTest {
3434
}
3535
}
3636

37-
@AppServer(version = "8.5.5.19", jdk = "8-openj9")
37+
@AppServer(version = "8.5.5.22", jdk = "8-openj9")
3838
class Websphere8Jdk8Openj9 extends WebsphereSmokeTest {
3939
}
4040

41-
@AppServer(version = "9.0.5.9", jdk = "8-openj9")
41+
@AppServer(version = "9.0.5.14", jdk = "8-openj9")
4242
class Websphere9Jdk8Openj9 extends WebsphereSmokeTest {
4343
}

0 commit comments

Comments
 (0)