diff --git a/.github/workflows/image-workflow-template.yml b/.github/workflows/image-workflow-template.yml index 7c666dbc..4c1b332b 100644 --- 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 deleted file mode 100644 index c6e68318..00000000 --- a/.github/workflows/ubi8-openjdk-17-runtime.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 17 Runtime Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-17-runtime -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-17-runtime diff --git a/.github/workflows/ubi8-openjdk-17.yml b/.github/workflows/ubi8-openjdk-17.yml deleted file mode 100644 index 79cc732d..00000000 --- a/.github/workflows/ubi8-openjdk-17.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 17 S2I Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-17 -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-17 diff --git a/.github/workflows/ubi8-openjdk-21-runtime.yml b/.github/workflows/ubi8-openjdk-21-runtime.yml deleted file mode 100644 index 20079c79..00000000 --- a/.github/workflows/ubi8-openjdk-21-runtime.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 21 Runtime Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-21-runtime -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-21-runtime diff --git a/.github/workflows/ubi8-openjdk-21.yml b/.github/workflows/ubi8-openjdk-21.yml deleted file mode 100644 index 8c1b21cc..00000000 --- a/.github/workflows/ubi8-openjdk-21.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 21 S2I Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-21 -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-21 diff --git a/.github/workflows/ubi8-openjdk-8-runtime.yml b/.github/workflows/ubi8-openjdk-8-runtime.yml deleted file mode 100644 index 96667c8f..00000000 --- a/.github/workflows/ubi8-openjdk-8-runtime.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 8 Runtime Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-8-runtime -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-8-runtime diff --git a/.github/workflows/ubi8-openjdk-8.yml b/.github/workflows/ubi8-openjdk-8.yml deleted file mode 100644 index 747c435d..00000000 --- a/.github/workflows/ubi8-openjdk-8.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI8 OpenJDK 8 S2I Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi8-openjdk-8 -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi8-openjdk-8 diff --git a/modules/jdk/tests/features/openjdk.feature b/modules/jdk/tests/features/openjdk.feature index 7833394b..bcb027f3 100644 --- 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 index 076f8c66..bbda372c 100644 --- 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 index 38b123da..2091abf0 100644 --- 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 index 7c271d08..db5a2ea3 100644 --- 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 index c8cbc482..eaff7862 100644 --- 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 index e4615b88..dbce0444 100644 --- 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 index e1452034..709a287c 100644 --- 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 index c3b3547a..8441bf2b 100644 --- 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 index ddbe31b4..0854b958 100644 --- 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 index 3b26c8d3..4e4148fd 100644 --- 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 index 1b7497a3..e83927a7 100644 --- 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 index 6416f7a3..cd5d5280 100644 --- 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 index 2463fdf2..9b1492ea 100644 --- 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 index 0d72808f..047c012e 100644 --- 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 index 74e76b9e..04fc3285 100644 --- 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 index af4f1c52..416df3a1 100644 --- 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 index d776c7a6..82ddd8d4 100644 --- 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 index 2aa5a9bc..1741ca74 100644 --- a/tests/features/java/ports.feature +++ b/tests/features/java/ports.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 port tests