Skip to content

Commit 670d27a

Browse files
jmtdjmtd
committed
update test tagging for UBI10
Signed-off-by: Jonathan Dowland <[email protected]>
1 parent d3fbab4 commit 670d27a

File tree

14 files changed

+36
-45
lines changed

14 files changed

+36
-45
lines changed

‎modules/jdk/tests/features/openjdk.feature

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

3-
@ubi9/openjdk-21
4-
@ubi9/openjdk-21-runtime
3+
@ubi10/openjdk-21
4+
@ubi10/openjdk-21-runtime
55
Scenario: Check that only OpenJDK 21 is installed
66
When container is started with args
77
| arg | value |
@@ -10,14 +10,14 @@ Feature: Miscellaneous OpenJDK-related unit tests
1010
Then available container log should not contain java-11
1111
Then available container log should not contain java-17
1212

13-
@ubi9
13+
@ubi10
1414
Scenario: Ensure JAVA_HOME is defined and contains Java
1515
When container is started with args
1616
| arg | value |
1717
| command | bash -c "$JAVA_HOME/bin/java -version" |
1818
Then available container log should contain OpenJDK Runtime Environment
1919

20-
@ubi9
20+
@ubi10
2121
Scenario: Check that certain non-UBI packages are not installed
2222
When container is started with args
2323
| arg | value |
@@ -26,8 +26,8 @@ Feature: Miscellaneous OpenJDK-related unit tests
2626
Then available container log should not contain os-prober
2727
Then available container log should not contain rpm-plugin-systemd-inhibit
2828

29-
@ubi9/openjdk-21
30-
@ubi9/openjdk-21-runtime
29+
@ubi10/openjdk-21
30+
@ubi10/openjdk-21-runtime
3131
Scenario: Check that directories from other JDKs are not present (JDK21)
3232
When container is started with args
3333
| arg | value |
@@ -36,21 +36,21 @@ Feature: Miscellaneous OpenJDK-related unit tests
3636
Then available container log should not contain java-11
3737
Then available container log should not contain java-17
3838

39-
@ubi9
39+
@ubi10
4040
Scenario: Ensure LANG is defined and contains UTF-8
4141
When container is started with args
4242
| arg | value |
4343
| command | bash -c "$JAVA_HOME/bin/java -XshowSettings:properties -version" |
4444
Then available container log should contain file.encoding = UTF-8
4545

46-
@ubi9
46+
@ubi10
4747
Scenario: Ensure tar is installed (OPENJDK-1165)
4848
When container is started with args
4949
| arg | value |
5050
| command | tar |
5151
Then available container log should not contain command not found
5252

53-
@ubi9
53+
@ubi10
5454
Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2519)
5555
When container is started with args
5656
| arg | value |

‎modules/jvm/tests/features/gc.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@ubi9
1+
@ubi10
22
Feature: Openshift OpenJDK GC tests
33

44
Scenario: Check default GC configuration

‎modules/jvm/tests/features/memory.feature

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
11
Feature: OPENJDK-559 JVM Memory tests
22

3-
@ubi9
3+
@ubi10
44
Scenario: Check default JVM max heap configuration
55
Given container is started as uid 1000
66
Then container log should contain -XX:MaxRAMPercentage=80.0
77

8-
@ubi9
8+
@ubi10
99
Scenario: Check configured JVM max heap configuration and ensure JAVA_MAX_MEM_RATIO accepts floats but only takes whole number part
1010
Given container is started with env
1111
| variable | value |
1212
| JAVA_MAX_MEM_RATIO | 90.4 |
1313
Then container log should contain -XX:MaxRAMPercentage=90.0
1414

15-
@ubi9
15+
@ubi10
1616
Scenario: Ensure JAVA_MAX_MEM_RATIO accepts Integers
1717
Given container is started with env
1818
| variable | value |
1919
| JAVA_MAX_MEM_RATIO | 90 |
2020
Then container log should contain -XX:MaxRAMPercentage=90.0
2121

22-
@ubi9
22+
@ubi10
2323
Scenario: Ensure JAVA_MAX_MEM_RATIO=0 disables parameter
2424
Given container is started with env
2525
| variable | value |
2626
| JAVA_MAX_MEM_RATIO | 0 |
2727
Then container log should not contain -XX:MaxRAMPercentage
2828

29-
@ubi9
29+
@ubi10
3030
Scenario: Check default JVM initial heap configuration is unspecified
3131
Given container is started as uid 1000
3232
Then container log should not contain -XX:InitialRAMPercentage
3333
And container log should not contain -Xms
3434

3535
# Not the runtime images
36-
@ubi9/openjdk-17
37-
@ubi9/openjdk-21
36+
@ubi10/openjdk-21
3837
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
3938
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
4039
Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$

‎modules/jvm/tests/features/runtime.feature

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
@ubi9/openjdk-17
2-
@ubi9/openjdk-21
1+
@ubi10/openjdk-21
32
Feature: Openshift OpenJDK Runtime tests
43

5-
@ubi9
4+
@ubi10
65
Scenario: Check JAVA_OPTS overrides defaults
76
Given container is started with env
87
| variable | value |
98
| JAVA_OPTS | --show-version |
109
Then container log should not contain -XX:MaxRAMPercentage
1110

12-
@ubi9
11+
@ubi10
1312
Scenario: Check empty JAVA_OPTS overrides defaults
1413
Given container is started with env
1514
| variable | value |
1615
| JAVA_OPTS | |
1716
Then container log should not contain -XX:MaxRAMPercentage
1817

19-
@ubi9
18+
@ubi10
2019
Scenario: Check JAVA_OPTS overrides JAVA_OPTS_APPEND
2120
Given container is started with env
2221
| variable | value |
@@ -25,26 +24,26 @@ Feature: Openshift OpenJDK Runtime tests
2524
Then container log should contain -verbose:gc
2625
And container log should not contain -Xint
2726

28-
@ubi9
27+
@ubi10
2928
Scenario: Check JAVA_APP_NAME can contain spaces (OPENJDK-1551)
3029
Given container is started with env
3130
| variable | value |
3231
| JAVA_APP_NAME | foo bar |
3332
Then container log should not contain exec: bar': not found
3433

35-
@ubi9
34+
@ubi10
3635
Scenario: Check default JAVA_APP_DIR (OPENJDK-2034)
3736
When container is ready
3837
Then available container log should contain INFO running in /deployments
3938

40-
@ubi9
39+
@ubi10
4140
Scenario: Check custom JAVA_APP_DIR (OPENJDK-2034)
4241
Given container is started with env
4342
| variable | value |
4443
| JAVA_APP_DIR | /home/default |
4544
Then available container log should contain INFO running in /home/default
4645

47-
@ubi9
46+
@ubi10
4847
Scenario: Check relative path JAVA_APP_DIR (OPENJDK-2034)
4948
Given container is started with env
5049
| variable | value |
@@ -53,6 +52,7 @@ Feature: Openshift OpenJDK Runtime tests
5352

5453
# temporarily disabled, see https://issues.redhat.com/browse/OPENJDK-3536
5554
@ignore
55+
@ubi10
5656
Scenario: Check non-existent path JAVA_APP_DIR (OPENJDK-2034)
5757
Given container is started with env
5858
| variable | value |

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# temporarily marking 'ignore' so these tests are skipped on GHA
22
@ignore
3-
@ubi9/openjdk-17
4-
@ubi9/openjdk-21
3+
@ubi10/openjdk-21
54
Feature: Openshift OpenJDK S2I tests
65
# NOTE: these tests should be usable with the other images once we have refactored the JDK scripts.
76
# These builds do not actually run maven. This is important, because the proxy

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@ubi9/openjdk-17
2-
@ubi9/openjdk-21
1+
@ubi10/openjdk-21
32
Feature: Openshift OpenJDK S2I tests
43

54
# test incremental builds

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@ubi9/openjdk-17
2-
@ubi9/openjdk-21
1+
@ubi10/openjdk-21
32
Feature: Openshift OpenJDK Runtime tests (OPENJDK-474, OPENJDK-2805)
43

54
Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@ubi9/openjdk-17
2-
@ubi9/openjdk-21
1+
@ubi10/openjdk-21
32
Feature: Openshift S2I tests
43
Scenario: Check networkaddress.cache.negative.ttl has been set correctly
54
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from binary-cli-security-property

‎modules/run/tests/features/run.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@ubi9
1+
@ubi10
22
Feature: OpenJDK run script tests
33
Scenario: Ensure command-line options containing 'password' are masked in logs
44
Given container is started with env

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# builder only
2-
@ubi9/openjdk-17
3-
@ubi9/openjdk-21
2+
@ubi10/openjdk-21
43
Feature: Openshift OpenJDK S2I tests (Quarkus-based)
54

65
Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673)

0 commit comments

Comments
 (0)