rh-openjdk · jmtd · Mar 4, 2025 · Dec 11, 2023 · Dec 13, 2023 · Dec 13, 2023
diff --git a/.github/workflows/gendocs.yml b/.github/workflows/gendocs.yml
@@ -41,13 +41,13 @@ jobs:
           ./gendocs.sh
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'docs'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/image-workflow-template.yml b/.github/workflows/image-workflow-template.yml
@@ -23,7 +23,7 @@ jobs:
         run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
 
       - name: Install CEKit
-        uses: cekit/[email protected].5
+        uses: cekit/[email protected].7
 
       - name: Build
         run: |
@@ -45,18 +45,4 @@ jobs:
       - name: Behave Tests
         run: |
           echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
-          cekit -v --descriptor ${{ inputs.image }}.yaml test --image localimage behave --steps-url https://github.com/jmtd/behave-test-steps
-
-      - if: github.event_name == 'push'
-        name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - if: github.event_name == 'push'
-        name: Tag and push container image
-        run: |
-          docker tag localimage ${{ env.IMAGE_URI }}
-          docker push ${{ env.IMAGE_URI }}
+          cekit -v --descriptor ${{ inputs.image }}.yaml test behave
diff --git a/README.adoc b/README.adoc
@@ -17,14 +17,14 @@ link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI
 link:https://access.redhat.com/documentation/en-us/openjdk/17[Red Hat provide
 Product documentation for customers]. Tables of environment variables used for
 image configuration are published to
-<https://jboss-container-images.github.io/openjdk/>. These tables are automatically
+<https://rh-openjdk.github.io/redhat-openjdk-containers/>. These tables are automatically
 updated for every tagged release, and every commit to the development branches.
 
 Older RHEL7 and RHEL8-based image sources are in the `rhel7` and `ubi8` branches respectively.
 
 ## How to build the images
 
-You need to https://cekit.readthedocs.io/en/develop/installation.html[install Cekit] to build these images.
+You need to https://docs.cekit.io/en/latest/handbook/installation/index.html[install Cekit] to build these images.
 
 These sources are prepared and tested for Cekit 4.1.1.
 

diff --git a/docs/README.adoc b/docs/README.adoc
@@ -1,10 +1,11 @@
-# Red Hat UBI OpenJDK container images
+= Red Hat UBI OpenJDK container images
+:toc: right
 
 This is auto-generated documentation for the
 link:https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image[Red
 Hat Universal Base Image] (UBI) OpenJDK container images.
 
-* link:https://github.com/jboss-container-images/openjdk[container image source repository]
+* link:https://rh-openjdk.github.io/redhat-openjdk-containers/[container image source repository]
 
 Container images are available from the
 link:https://catalog.redhat.com/software/containers/explore[Red Hat Ecosystem

diff --git a/gendocs.sh b/gendocs.sh
@@ -67,18 +67,16 @@ workdir="$(mktemp -td gendocs.XXXXXX)"
 cp ./gendocs.py "$workdir/gendocs.py"
 cp ./docs/README.adoc "$workdir/README.adoc"
 
-# documentation for development branches
-addToIndex "\n== Development branches ==\n"
-for branch in ubi8 ubi9; do
-    addToIndex "\n=== $branch ===\n"
-    handleRef "$branch" "$branch"
-done
-
-# documentation for tagged releases
-addToIndex "\n== Released images =="
-for tag in $(git tag -l 'ubi?-openjdk-containers*' | sort -r); do
-    addToIndex "\n=== $tag ===\n"
-    handleRef "$tag"
+for ubi in ubi9 ubi8; do
+    UBI=${ubi^^}
+    addToIndex "\n== $UBI\n"
+    addToIndex "\n=== development\n"
+    handleRef "$ubi"
+    for tag in $(git tag -l "${ubi}-openjdk-containers*" | sort -r); do
+        version=${tag/${ubi}-openjdk-containers-/}
+        addToIndex "\n=== $version\n"
+        handleRef "$tag"
+    done
 done
 
 asciidoctor "$workdir/README.adoc" -o docs/index.html
diff --git a/modules/jdk/11/module.yaml b/modules/jdk/11/module.yaml
@@ -30,6 +30,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/17/module.yaml b/modules/jdk/17/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
@@ -30,6 +30,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/8/module.yaml b/modules/jdk/8/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/module.yaml b/modules/jdk/module.yaml
@@ -0,0 +1,5 @@
+schema_version: 1
+
+name: "jboss.container.openjdk"
+description: "A dummy descriptor to couple tests with jdk modules"
+version: "0"
diff --git a/tests/features/java/openjdk.feature → modules/jdk/tests/features/openjdk.feature b/tests/features/java/openjdk.feature → modules/jdk/tests/features/openjdk.feature
@@ -89,3 +89,10 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | arg     | value |
     | command | tar   |
     Then available container log should not contain command not found
+
+  @ubi9
+  Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2519)
+    When container is started with args
+    | arg     | value         |
+    | command | rpm -V tzdata |
+    Then available container log should not contain missing
diff --git a/modules/jre/11/module.yaml b/modules/jre/11/module.yaml
@@ -30,6 +30,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/17/module.yaml b/modules/jre/17/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/8/module.yaml b/modules/jre/8/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/tests/features/java/gc.feature → modules/jvm/tests/features/gc.feature b/tests/features/java/gc.feature → modules/jvm/tests/features/gc.feature
diff --git a/tests/features/java/memory.feature → modules/jvm/tests/features/memory.feature b/tests/features/java/memory.feature → modules/jvm/tests/features/memory.feature
@@ -37,5 +37,5 @@ Feature: OPENJDK-559 JVM Memory tests
   @ubi9/openjdk-17
   @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$
diff --git a/tests/features/java/runtime.feature → modules/jvm/tests/features/runtime.feature b/tests/features/java/runtime.feature → modules/jvm/tests/features/runtime.feature
@@ -3,16 +3,6 @@
 @openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK Runtime tests
 
-  Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-       | variable         | value  |
-       | JAVA_ARGS        | unique |
-       | JAVA_DIAGNOSTICS | true   |
-    Then container log should contain /deployments/undertow-servlet.jar unique
-     And container log should contain -XX:NativeMemoryTracking=summary
-     And file /usr/local/s2i/run should not contain JVM_ARGS
-     And container log should not contain unique unique
-
   @ubi9
   Scenario: Check JAVA_OPTS overrides defaults
     Given container is started with env
@@ -62,7 +52,8 @@ Feature: Openshift OpenJDK Runtime tests
     | JAVA_APP_DIR | .      |
   Then available container log should contain INFO running in /home/default
 
-  @ubi9
+  # temporarily disabled, see https://issues.redhat.com/browse/OPENJDK-3536
+  @ignore
   Scenario: Check non-existent path JAVA_APP_DIR (OPENJDK-2034)
     Given container is started with env
     | variable     | value  |
@@ -71,7 +62,7 @@ Feature: Openshift OpenJDK Runtime tests
 
   # Builder images only
   Scenario: Ensure JAVA_APP_DIR and S2I work together (OPENJDK-2034)
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
        | variable                   | value         |
        | JAVA_APP_DIR               | /home/default |
        | S2I_TARGET_DEPLOYMENTS_DIR | /home/default |

diff --git a/modules/maven/21/configure.sh b/modules/maven/21/configure.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# This file is shipped by a Maven package and sets JAVA_HOME to
+# an OpenJDK-specific path. This causes problems for OpenJ9 containers
+# as the path is not correct for them.  We don't need this in any of
+# the containers because we set JAVA_HOME in the container metadata.
+# Blank the file rather than removing it, to avoid a warning message
+# from /usr/bin/mvn.
+if [ -f /etc/java/maven.conf ]; then
+  :> /etc/java/maven.conf
+fi
diff --git a/modules/maven/21/module.yaml b/modules/maven/21/module.yaml
@@ -0,0 +1,21 @@
+schema_version: 1
+name: jboss.container.maven
+version: '3.8.21'
+description: Provides Maven v3.8 capabilities to an image.
+
+envs:
+- name: JBOSS_CONTAINER_MAVEN_38_MODULE
+  value: /opt/jboss/container/maven/38/
+- name: MAVEN_VERSION
+  value: '3.8'
+
+modules:
+  install:
+  - name: jboss.container.maven.module
+
+packages:
+  install:
+  - maven-openjdk21
+
+execute:
+- script: configure.sh
diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
@@ -76,7 +76,7 @@ function maven_s2i_build() {
   s2i_core_cleanup
 
   # Remove java tmp perf data dir owned by 185
-  rm -rf /tmp/hsperfdata_jboss
+  rm -rf "/tmp/hsperfdata_${USER}"
 }
 
 # perform a maven build, i.e.  mvn ...