Skip to content

Commit 2d8f712

Browse files
vieirovieiro
committed
[OPENJDK-3426] Adjust Behave test tagging for new container names
Signed-off-by: Antonio Vieiro <[email protected]>
1 parent 5118276 commit 2d8f712

21 files changed

+39
-378
lines changed

‎.github/workflows/image-workflow-template.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: clear docker credentials
4040
run: docker logout
4141

42-
# - name: Behave Tests
43-
# run: |
44-
# echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
45-
# cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
42+
- name: Behave Tests
43+
run: |
44+
echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
45+
cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps

‎.github/workflows/ubi9-openjdk-17-runtime.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows/ubi9-openjdk-17.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows/ubi9-openjdk-21-runtime.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows/ubi9-openjdk-21.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

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

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

13-
@ubi9/openjdk-17
14-
@ubi9/openjdk-17-runtime
15-
Scenario: Check that only OpenJDK 17 is installed
16-
When container is started with args
17-
| arg | value |
18-
| command | rpm -qa |
19-
Then available container log should not contain java-1.8.0
20-
Then available container log should not contain java-11
21-
Then available container log should not contain java-21
22-
23-
@ubi9/openjdk-21
24-
@ubi9/openjdk-21-runtime
25-
Scenario: Check that only OpenJDK 21 is installed
26-
When container is started with args
27-
| arg | value |
28-
| command | rpm -qa |
29-
Then available container log should not contain java-1.8.0
30-
Then available container log should not contain java-11
31-
Then available container log should not contain java-17
32-
33-
@ubi9
13+
@openjdk-els
3414
Scenario: Ensure JAVA_HOME is defined and contains Java
3515
When container is started with args
3616
| arg | value |
3717
| command | bash -c "$JAVA_HOME/bin/java -version" |
3818
Then available container log should contain OpenJDK Runtime Environment
3919

40-
@ubi9
20+
@openjdk-els
4121
Scenario: Check that certain non-UBI packages are not installed
4222
When container is started with args
4323
| arg | value |
@@ -46,8 +26,8 @@ Feature: Miscellaneous OpenJDK-related unit tests
4626
Then available container log should not contain os-prober
4727
Then available container log should not contain rpm-plugin-systemd-inhibit
4828

49-
@ubi9/openjdk-11
50-
@ubi9/openjdk-11-runtime
29+
@openjdk-els/openjdk-11-rhel9
30+
@openjdk-els/openjdk-11-runtime-rhel9
5131
Scenario: Check that directories from other JDKs are not present (JDK11)
5232
When container is started with args
5333
| arg | value |
@@ -56,41 +36,21 @@ Feature: Miscellaneous OpenJDK-related unit tests
5636
Then available container log should not contain java-17
5737
Then available container log should not contain java-21
5838

59-
@ubi9/openjdk-17
60-
@ubi9/openjdk-17-runtime
61-
Scenario: Check that directories from other JDKs are not present (JDK17)
62-
When container is started with args
63-
| arg | value |
64-
| command | ls -1 /usr/lib/jvm |
65-
Then available container log should not contain java-1.8.0
66-
Then available container log should not contain java-11
67-
Then available container log should not contain java-21
68-
69-
@ubi9/openjdk-21
70-
@ubi9/openjdk-21-runtime
71-
Scenario: Check that directories from other JDKs are not present (JDK21)
72-
When container is started with args
73-
| arg | value |
74-
| command | ls -1 /usr/lib/jvm |
75-
Then available container log should not contain java-1.8.0
76-
Then available container log should not contain java-11
77-
Then available container log should not contain java-17
78-
79-
@ubi9
39+
@openjdk-els
8040
Scenario: Ensure LANG is defined and contains UTF-8
8141
When container is started with args
8242
| arg | value |
8343
| command | bash -c "$JAVA_HOME/bin/java -XshowSettings:properties -version" |
8444
Then available container log should contain file.encoding = UTF-8
8545

86-
@ubi9
46+
@openjdk-els
8747
Scenario: Ensure tar is installed (OPENJDK-1165)
8848
When container is started with args
8949
| arg | value |
9050
| command | tar |
9151
Then available container log should not contain command not found
9252

93-
@ubi9
53+
@openjdk-els
9454
Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2519)
9555
When container is started with args
9656
| 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+
@openjdk-els
22
Feature: Openshift OpenJDK GC tests
33

44
Scenario: Check default GC configuration

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

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

3-
@ubi9
3+
@openjdk-els
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+
@openjdk-els
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+
@openjdk-els
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+
@openjdk-els
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+
@openjdk-els
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-11
37-
@ubi9/openjdk-17
38-
@ubi9/openjdk-21
36+
@openjdk-els/openjdk-11-rhel9
3937
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
4038
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
4139
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 & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
@ubi9/openjdk-11
2-
@ubi9/openjdk-17
3-
@ubi9/openjdk-21
1+
@openjdk-els/openjdk-11-rhel9
42
Feature: Openshift OpenJDK Runtime tests
53

6-
@ubi9
4+
@openjdk-els
75
Scenario: Check JAVA_OPTS overrides defaults
86
Given container is started with env
97
| variable | value |
108
| JAVA_OPTS | --show-version |
119
Then container log should not contain -XX:MaxRAMPercentage
1210

13-
@ubi9
11+
@openjdk-els
1412
Scenario: Check empty JAVA_OPTS overrides defaults
1513
Given container is started with env
1614
| variable | value |
1715
| JAVA_OPTS | |
1816
Then container log should not contain -XX:MaxRAMPercentage
1917

20-
@ubi9
18+
@openjdk-els
2119
Scenario: Check JAVA_OPTS overrides JAVA_OPTS_APPEND
2220
Given container is started with env
2321
| variable | value |
@@ -26,33 +24,33 @@ Feature: Openshift OpenJDK Runtime tests
2624
Then container log should contain -verbose:gc
2725
And container log should not contain -Xint
2826

29-
@ubi9
27+
@openjdk-els
3028
Scenario: Check JAVA_APP_NAME can contain spaces (OPENJDK-1551)
3129
Given container is started with env
3230
| variable | value |
3331
| JAVA_APP_NAME | foo bar |
3432
Then container log should not contain exec: bar': not found
3533

36-
@ubi9
34+
@openjdk-els
3735
Scenario: Check default JAVA_APP_DIR (OPENJDK-2034)
3836
When container is ready
3937
Then available container log should contain INFO running in /deployments
4038

41-
@ubi9
39+
@openjdk-els
4240
Scenario: Check custom JAVA_APP_DIR (OPENJDK-2034)
4341
Given container is started with env
4442
| variable | value |
4543
| JAVA_APP_DIR | /home/default |
4644
Then available container log should contain INFO running in /home/default
4745

48-
@ubi9
46+
@openjdk-els
4947
Scenario: Check relative path JAVA_APP_DIR (OPENJDK-2034)
5048
Given container is started with env
5149
| variable | value |
5250
| JAVA_APP_DIR | . |
5351
Then available container log should contain INFO running in /home/default
5452

55-
@ubi9
53+
@openjdk-els
5654
Scenario: Check non-existent path JAVA_APP_DIR (OPENJDK-2034)
5755
Given container is started with env
5856
| variable | value |

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

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

0 commit comments

Comments
 (0)