From 38d9c000b3eb532405f8296bfb7015c362062567 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 24 Jan 2025 14:09:14 +0000 Subject: [PATCH 1/5] [OPENJDK-3597] test for MAVEN_SETTINGS_XML This test checks a custom test application source to ensure that a custom settings.xml, which defines a custom profile, has been activated. Signed-off-by: Jonathan Dowland --- modules/maven/s2i/tests/features/java_s2i.feature | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/maven/s2i/tests/features/java_s2i.feature b/modules/maven/s2i/tests/features/java_s2i.feature index 5311942f..6e3c69c2 100644 --- a/modules/maven/s2i/tests/features/java_s2i.feature +++ b/modules/maven/s2i/tests/features/java_s2i.feature @@ -175,6 +175,17 @@ Feature: Openshift OpenJDK S2I tests | variable | value | | MAVEN_ARGS | validate | + Scenario: Ensure no custom settings.xml fails for specific application (OPENJDK-3597) + Given failing s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-3597-custom-settings-xml using master + Then s2i build log should contain [ERROR] Profile "testCustomProfile" is not activated + + Scenario: Ensure custom settings.xml copied in via MAVEN_SETTINGS_XML (OPENJDK-3597) + Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-3597-custom-settings-xml with env + | variable | value | + | MAVEN_ARGS | validate | + | MAVEN_SETTINGS_XML | /tmp/src/settings.xml | + Then s2i build log should contain Rule 0: org.apache.maven.enforcer.rules.RequireActiveProfile passed + Scenario: Ensure that run-env.sh placed in the JAVA_APP_DIR is sourced in the run script before launching java Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i | variable | value | From d281df9c599ba8447c71d104740b53c4e5a8d740 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 4 Feb 2025 10:20:50 +0000 Subject: [PATCH 2/5] [OPENJDK-3637] clean up correct hsperfdata path The hsperfdata path is determined by the running user's username. This is no longer "jboss", but "default". Use "${USER}" so that we catch any future changes in username. Signed-off-by: Jonathan Dowland --- .../maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b8e1a81c..fb433d29 100644 --- 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 ... From 0ba78bfbb586c328354b31edd52300b7aa117ca1 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Wed, 5 Mar 2025 08:50:35 +0000 Subject: [PATCH 3/5] Bump cekit/actions-setup-cekit to v1.1.7 This should fix the gendocs action. Signed-off-by: Jonathan Dowland --- .github/workflows/gendocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gendocs.yml b/.github/workflows/gendocs.yml index 597e546e..23e57c9c 100644 --- a/.github/workflows/gendocs.yml +++ b/.github/workflows/gendocs.yml @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 # all branches and tags - name: Install CEKit - uses: cekit/actions-setup-cekit@v1.1.5 + uses: cekit/actions-setup-cekit@v1.1.7 - name: Setup required packages for docs run: | From e93fe564297485d3f882e19fc3c71a2ded986d5f Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 25 Mar 2025 08:30:24 +0000 Subject: [PATCH 4/5] Bump container version for next release Signed-off-by: Jonathan Dowland --- ubi9-openjdk-17-runtime.yaml | 2 +- ubi9-openjdk-17.yaml | 2 +- ubi9-openjdk-21-runtime.yaml | 2 +- ubi9-openjdk-21.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubi9-openjdk-17-runtime.yaml b/ubi9-openjdk-17-runtime.yaml index 3d72a716..f353946f 100644 --- a/ubi9-openjdk-17-runtime.yaml +++ b/ubi9-openjdk-17-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-17-runtime" -version: &version "1.21" +version: &version "1.22" description: "Image for Red Hat OpenShift providing OpenJDK 17 runtime" labels: diff --git a/ubi9-openjdk-17.yaml b/ubi9-openjdk-17.yaml index 825027ff..98a9552a 100644 --- a/ubi9-openjdk-17.yaml +++ b/ubi9-openjdk-17.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-17" -version: &version "1.21" +version: &version "1.22" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 17" labels: diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi9-openjdk-21-runtime.yaml index 74400dd2..05399c0a 100644 --- a/ubi9-openjdk-21-runtime.yaml +++ b/ubi9-openjdk-21-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-21-runtime" -version: &version "1.21" +version: &version "1.22" description: "Image for Red Hat OpenShift providing OpenJDK 21 runtime" labels: diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml index 5caddc97..2f258995 100644 --- a/ubi9-openjdk-21.yaml +++ b/ubi9-openjdk-21.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-21" -version: &version "1.21" +version: &version "1.22" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21" labels: From b838a7ba3975e3ff275f76b4ebd18d58471c4efb Mon Sep 17 00:00:00 2001 From: Antonio Vieiro Date: Wed, 16 Apr 2025 10:16:44 +0200 Subject: [PATCH 5/5] [OPENJDK-3768] Bump ELS RHEL9 image version Signed-off-by: Antonio Vieiro --- openjdk-11-rhel9.yaml | 2 +- openjdk-11-runtime-rhel9.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openjdk-11-rhel9.yaml b/openjdk-11-rhel9.yaml index 1b741a17..9b3e530a 100644 --- a/openjdk-11-rhel9.yaml +++ b/openjdk-11-rhel9.yaml @@ -7,7 +7,7 @@ schema_version: 1 # products. This image is maintained by Red Hat and updated regularly. from: "registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal" name: &name "openjdk-els/openjdk-11-rhel9" -version: &version "1.21" +version: &version "1.22" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11" labels: diff --git a/openjdk-11-runtime-rhel9.yaml b/openjdk-11-runtime-rhel9.yaml index 1b12175f..fc3d3695 100644 --- a/openjdk-11-runtime-rhel9.yaml +++ b/openjdk-11-runtime-rhel9.yaml @@ -7,7 +7,7 @@ schema_version: 1 # products. This image is maintained by Red Hat and updated regularly. from: "registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal" name: &name "openjdk-els/openjdk-11-runtime-rhel9" -version: &version "1.21" +version: &version "1.22" description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime" labels: