Skip to content

Commit 24920b1

Browse files
committed
Remove JDK11 specific tests and test tagging
Signed-off-by: Jonathan Dowland <[email protected]>
1 parent bdf6396 commit 24920b1

File tree

11 files changed

+0
-30
lines changed

11 files changed

+0
-30
lines changed

modules/jdk/tests/features/openjdk.feature

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
Feature: Miscellaneous OpenJDK-related unit tests
22

3-
@ubi9/openjdk-11
4-
@ubi9/openjdk-11-runtime
5-
Scenario: Check that only OpenJDK 11 is installed
6-
When container is started with args
7-
| arg | value |
8-
| command | rpm -qa |
9-
Then available container log should not contain java-1.8.0
10-
Then available container log should not contain java-17
11-
Then available container log should not contain java-21
12-
133
@ubi9/openjdk-17
144
@ubi9/openjdk-17-runtime
155
Scenario: Check that only OpenJDK 17 is installed
@@ -46,16 +36,6 @@ Feature: Miscellaneous OpenJDK-related unit tests
4636
Then available container log should not contain os-prober
4737
Then available container log should not contain rpm-plugin-systemd-inhibit
4838

49-
@ubi9/openjdk-11
50-
@ubi9/openjdk-11-runtime
51-
Scenario: Check that directories from other JDKs are not present (JDK11)
52-
When container is started with args
53-
| arg | value |
54-
| command | ls -1 /usr/lib/jvm |
55-
Then available container log should not contain java-1.8.0
56-
Then available container log should not contain java-17
57-
Then available container log should not contain java-21
58-
5939
@ubi9/openjdk-17
6040
@ubi9/openjdk-17-runtime
6141
Scenario: Check that directories from other JDKs are not present (JDK17)

modules/jvm/tests/features/memory.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Feature: OPENJDK-559 JVM Memory tests
3333
And container log should not contain -Xms
3434

3535
# Not the runtime images
36-
@ubi9/openjdk-11
3736
@ubi9/openjdk-17
3837
@ubi9/openjdk-21
3938
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80

modules/jvm/tests/features/runtime.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@ubi9/openjdk-11
21
@ubi9/openjdk-17
32
@ubi9/openjdk-21
43
Feature: Openshift OpenJDK Runtime tests

modules/maven/s2i/tests/features/java_s2i.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# temporarily marking 'ignore' so these tests are skipped on GHA
22
@ignore
3-
@ubi9/openjdk-11
43
@ubi9/openjdk-17
54
@ubi9/openjdk-21
65
Feature: Openshift OpenJDK S2I tests

modules/maven/s2i/tests/features/java_s2i_inc.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@ubi9/openjdk-11
21
@ubi9/openjdk-17
32
@ubi9/openjdk-21
43
Feature: Openshift OpenJDK S2I tests

modules/run/tests/features/java.runtime.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@ubi9/openjdk-11
21
@ubi9/openjdk-17
32
@ubi9/openjdk-21
43
Feature: Openshift OpenJDK Runtime tests (OPENJDK-474, OPENJDK-2805)

modules/run/tests/features/java.security.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@ubi9/openjdk-11
21
@ubi9/openjdk-17
32
@ubi9/openjdk-21
43
Feature: Openshift S2I tests

modules/s2i/core/tests/features/java_s2i_quarkus.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# builder only
2-
@ubi9/openjdk-11
32
@ubi9/openjdk-17
43
@ubi9/openjdk-21
54
Feature: Openshift OpenJDK S2I tests (Quarkus-based)

modules/s2i/core/tests/features/s2i-core.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@ubi9/openjdk-11
21
@ubi9/openjdk-17
32
@ubi9/openjdk-21
43
Feature: Openshift S2I tests

tests/features/imagebasic.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Feature: Tests for all openshift images
99
And the image should contain label name containing value openjdk
1010

1111
# builder-only test
12-
@ubi9/openjdk-11
1312
@ubi9/openjdk-17
1413
@ubi9/openjdk-21
1514
Scenario: Check that builder labels are correctly set

0 commit comments

Comments
 (0)