Merge pull request #523 from vieiro/features/OPENJDK-3448

jmtd · web-flow · commit b2ff61e3b41c · 2024-11-21T11:44:37.000Z
[OPENJDK-3448] Adjust Behave test tagging for new container names in RHEL8 Too
diff --git a/.github/workflows/image-workflow-template.yml b/.github/workflows/image-workflow-template.yml
@@ -39,7 +39,7 @@ jobs:
       - name: clear docker credentials
         run: docker logout
 
-#      - name: Behave Tests
-#        run: |
-#          echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
-#          cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
+      - name: Behave Tests
+        run: |
+          echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
+          cekit -v --descriptor ${{ inputs.image }}.yaml test behave --steps-url https://github.com/jmtd/behave-test-steps
diff --git a/.github/workflows/ubi8-openjdk-17-runtime.yml b/.github/workflows/ubi8-openjdk-17-runtime.yml
diff --git a/.github/workflows/ubi8-openjdk-17.yml b/.github/workflows/ubi8-openjdk-17.yml
diff --git a/.github/workflows/ubi8-openjdk-21-runtime.yml b/.github/workflows/ubi8-openjdk-21-runtime.yml
diff --git a/.github/workflows/ubi8-openjdk-21.yml b/.github/workflows/ubi8-openjdk-21.yml
diff --git a/.github/workflows/ubi8-openjdk-8-runtime.yml b/.github/workflows/ubi8-openjdk-8-runtime.yml
diff --git a/.github/workflows/ubi8-openjdk-8.yml b/.github/workflows/ubi8-openjdk-8.yml
diff --git a/modules/jdk/tests/features/openjdk.feature b/modules/jdk/tests/features/openjdk.feature
@@ -11,8 +11,8 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then available container log should not contain java-11
     Then available container log should not contain java-17
 
-  @ubi8/openjdk-11
-  @ubi8/openjdk-11-runtime
+  @openjdk-els/openjdk-11-rhel8
+  @openjdk-els/openjdk-11-runtime-rhel8
   Scenario: Check that only OpenJDK 11 is installed
     When container is started with args
     | arg     | value   |
@@ -40,14 +40,14 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then available container log should not contain java-11
     Then available container log should not contain java-17
 
-  @ubi8
+  @openjdk-els
   Scenario: Ensure JAVA_HOME is defined and contains Java
     When container is started with args
     | arg     | value                                  |
     | command | bash -c "$JAVA_HOME/bin/java -version" |
     Then available container log should contain OpenJDK Runtime Environment
 
-  @ubi8
+  @openjdk-els
   Scenario: Check that certain non-UBI packages are not installed
     When container is started with args
     | arg     | value   |
@@ -64,7 +64,7 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then available container log should not contain java-11
     And  available container log should not contain java-17
 
-  @ubi8/openjdk-11
+  @openjdk-els/openjdk-11-rhel8
   Scenario: Check that directories from other JDKs are not present (JDK11)
     When container is started with args
     | arg     | value   |
@@ -94,8 +94,8 @@ Feature: Miscellaneous OpenJDK-related unit tests
 
   @ubi8/openjdk-8
   @ubi8/openjdk-8-runtime
-  @ubi8/openjdk-11
-  @ubi8/openjdk-11-runtime
+  @openjdk-els/openjdk-11-rhel8
+  @openjdk-els/openjdk-11-runtime-rhel8
   @ubi8/openjdk-17
   @ubi8/openjdk-17-runtime
   Scenario: Ensure LANG is defined and contains UTF-8
@@ -105,7 +105,7 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then available container log should contain file.encoding = UTF-8
 
   @ubi8/openjdk-8
-  @ubi8/openjdk-11
+  @openjdk-els/openjdk-11-rhel8
   @ubi8/openjdk-17
   Scenario: Check that transitive weak dependencies are not installed (OPENJDK-1335)
     When container is started with args
@@ -119,14 +119,14 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then container log should not contain libxkbcommon
     Then container log should not contain kbd
 
-  @ubi8
+  @openjdk-els
   Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2587)
     When container is started with args
     | arg     | value         |
     | command | rpm -V tzdata |
     Then available container log should not contain missing
     
-  @ubi8
+  @openjdk-els
   Scenario: Ensure tar is installed (OPENJDK-2588)
     When container is started with args
     | arg     | value |
diff --git a/modules/jolokia/8.2/tests/features/jolokia.feature b/modules/jolokia/8.2/tests/features/jolokia.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 # Tests for jboss/container/jolokia
 Feature: Openshift OpenJDK Jolokia tests
 
diff --git a/modules/jvm/api/tests/features/gc.feature b/modules/jvm/api/tests/features/gc.feature
@@ -1,4 +1,4 @@
-@ubi8
+@openjdk-els
 Feature: Openshift OpenJDK GC tests
 
   Scenario: Check default GC configuration
diff --git a/modules/jvm/api/tests/features/memory.feature b/modules/jvm/api/tests/features/memory.feature
@@ -1,53 +1,53 @@
 Feature: OPENJDK-559 JVM Memory tests
 
-  @ubi8
+  @openjdk-els
   Scenario: Check default JVM max heap configuration
     Given container is started as uid 1000
     Then container log should contain -XX:MaxRAMPercentage=80.0
     And  container log should not contain -Xmx
 
-  @ubi8
+  @openjdk-els
   Scenario: Check configured JVM max heap configuration and ensure JAVA_MAX_MEM_RATIO accepts floats but only takes whole number part
     Given container is started with env
     | variable           | value  |
     | JAVA_MAX_MEM_RATIO | 90.4   |
     Then container log should contain -XX:MaxRAMPercentage=90.0
 
-  @ubi8
+  @openjdk-els
   Scenario: Ensure JAVA_MAX_MEM_RATIO accepts Integers
     Given container is started with env
     | variable           | value  |
     | JAVA_MAX_MEM_RATIO | 90     |
     Then container log should contain -XX:MaxRAMPercentage=90.0
 
-  @ubi8
+  @openjdk-els
   Scenario: Ensure JAVA_INITIAL_MEM_RATIO accepts Integers
     Given container is started with env
     | variable               | value  |
     | JAVA_INITIAL_MEM_RATIO | 10     |
     Then container log should contain -XX:InitialRAMPercentage=10.0
 
-  @ubi8
+  @openjdk-els
   Scenario: Ensure JAVA_MAX_MEM_RATIO=0 disables parameter
     Given container is started with env
     | variable           | value  |
     | JAVA_MAX_MEM_RATIO | 0     |
     Then container log should not contain -XX:MaxRAMPercentage
 
-  @ubi8
+  @openjdk-els
   Scenario: Check default JVM initial heap configuration is unspecified
     Given container is started as uid 1000
     Then container log should not contain -XX:InitialRAMPercentage
     And  container log should not contain -Xms
 
-  @ubi8
+  @openjdk-els
   Scenario: Check configured JVM max heap configuration and ensure JAVA_INITIAL_MEM_RATIO accepts floats but only takes whole number part
     Given container is started with env
     | variable               | value  |
     | JAVA_INITIAL_MEM_RATIO | 25.2   |
     Then container log should contain -XX:InitialRAMPercentage=25.0
 
-  @ubi8
+  @openjdk-els
   Scenario: check JAVA_MAX_INITIAL_MEM overrides JAVA_INITIAL_MEM_RATIO
     Given container is started with env
     | variable               | value  |
@@ -58,7 +58,7 @@ Feature: OPENJDK-559 JVM Memory tests
 
   # Not the runtime images
   @ubi8/openjdk-8
-  @ubi8/openjdk-11
+  @openjdk-els/openjdk-11-rhel8
   @ubi8/openjdk-17
   @ubi8/openjdk-21
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
diff --git a/modules/jvm/api/tests/features/runtime.feature b/modules/jvm/api/tests/features/runtime.feature
@@ -1,17 +1,17 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: OpenJDK Runtime tests 
 
-  @ubi8
+  @openjdk-els
   Scenario: Check JAVA_OPTS overrides defaults (OPENJDK-2009)
     Given container is started with env
     | variable  | value          |
     | JAVA_OPTS | --show-version |
     Then container log should not contain -XX:MaxRAMPercentage
 
-  @ubi8
+  @openjdk-els
   Scenario: Check empty JAVA_OPTS overrides defaults (OPENJDK-2009)
     Given container is started with env
     | variable  | value          |
diff --git a/modules/maven/s2i/tests/features/java_s2i.feature b/modules/maven/s2i/tests/features/java_s2i.feature
@@ -2,7 +2,7 @@
 # See: https://issues.redhat.com/browse/OPENJDK-2602
 @ignore
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK S2I tests
diff --git a/modules/maven/s2i/tests/features/java_s2i_inc.feature b/modules/maven/s2i/tests/features/java_s2i_inc.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK S2I tests
diff --git a/modules/maven/s2i/tests/features/java_s2i_quarkus.feature b/modules/maven/s2i/tests/features/java_s2i_quarkus.feature
@@ -1,4 +1,4 @@
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK S2I tests (Quarkus-based)
diff --git a/modules/prometheus/tests/features/prometheus.feature b/modules/prometheus/tests/features/prometheus.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 Feature: Prometheus agent tests
 
diff --git a/modules/run/tests/features/java.runtime.feature b/modules/run/tests/features/java.runtime.feature
@@ -1,35 +1,35 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK Runtime tests
-  @ubi8
+  @openjdk-els
   Scenario: Check JAVA_APP_NAME can contain spaces (OPENJDK-104)
     Given container is started with env
     | variable         | value   |
     | JAVA_APP_NAME    | foo bar |
   Then container log should not contain exec: bar': not found
 
-  @ubi8
+  @openjdk-els
   Scenario: Check default JAVA_APP_DIR (OPENJDK-2033)
   When container is ready
   Then available container log should contain INFO running in /deployments
 
-  @ubi8
+  @openjdk-els
   Scenario: Check custom JAVA_APP_DIR (OPENJDK-2033)
     Given container is started with env
     | variable     | value       |
     | JAVA_APP_DIR | /home/jboss |
   Then available container log should contain INFO running in /home/jboss
 
-  @ubi8
+  @openjdk-els
   Scenario: Check relative path JAVA_APP_DIR (OPENJDK-2033)
     Given container is started with env
     | variable     | value  |
     | JAVA_APP_DIR | .      |
   Then available container log should contain INFO running in /home/jboss
 
-  @ubi8
+  @openjdk-els
   Scenario: Check non-existent path JAVA_APP_DIR (OPENJDK-2033)
     Given container is started with env
     | variable     | value  |
@@ -53,7 +53,7 @@ Feature: Openshift OpenJDK Runtime tests
     Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
       And container log should contain -XX:NativeMemoryTracking=summary
 
-  @ubi8
+  @openjdk-els
   Scenario: OPENJDK-474 to ensure JAVA_ARGS is not duplicated in the java command line
     Given container is started with env
     | variable  | value  |
diff --git a/modules/run/tests/features/java.security.feature b/modules/run/tests/features/java.security.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift S2I tests
diff --git a/modules/run/tests/features/run.feature b/modules/run/tests/features/run.feature
@@ -1,4 +1,4 @@
-@ubi8
+@openjdk-els
 Feature: OpenJDK run script tests
   Scenario: OPENJDK-3009: Ensure command-line options containing 'password' are masked in logs
     Given container is started with env
diff --git a/modules/s2i/bash/tests/features/java.s2i.runtime.feature b/modules/s2i/bash/tests/features/java.s2i.runtime.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: OpenJDK JAVA s2i Runtime tests
diff --git a/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
@@ -1,5 +1,5 @@
 # builder only
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK S2I tests (Quarkus-based)
diff --git a/modules/s2i/core/api/tests/features/s2i-core.feature b/modules/s2i/core/api/tests/features/s2i-core.feature
@@ -1,5 +1,5 @@
 @ubi8/openjdk-8
-@ubi8/openjdk-11
+@openjdk-els/openjdk-11-rhel8
 @ubi8/openjdk-17
 @ubi8/openjdk-21
 Feature: Openshift S2I tests
diff --git a/modules/user/tests/features/general.feature b/modules/user/tests/features/general.feature
@@ -1,6 +1,6 @@
 Feature: Miscellaneous general settings unit tests
 
-  @ubi8
+  @openjdk-els
   Scenario: Check the attributes of /home/jboss using stat
     When container is started with args
     | arg     | value            |
diff --git a/tests/features/imagebasic.feature b/tests/features/imagebasic.feature
@@ -1,6 +1,6 @@
 Feature: Tests for all openshift images
 
-  @ubi8
+  @openjdk-els
   Scenario: Check that common labels are correctly set
     Given image is built
     # UBI base image versions are the RHEL version, e.g. "9.2", whereas all of
@@ -10,7 +10,7 @@ Feature: Tests for all openshift images
 
   # builder-only test
   @ubi8/openjdk-8
-  @ubi8/openjdk-11
+  @openjdk-els/openjdk-11-rhel8
   @ubi8/openjdk-17
   @ubi8/openjdk-21
   Scenario: Check that builder labels are correctly set
diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@ubi8`
	`1`	`+@openjdk-els`
`2`	`2`	`Feature: Openshift OpenJDK GC tests`
`3`	`3`
`4`	`4`	`Scenario: Check default GC configuration`