Override MaxRAMPercentage

Override MaxRAMPercentage for JVMs invoked by Maven to avoid
attempting to use too much of the pod RAM.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh

@@ -41,7 +41,7 @@ function maven_init_var_MAVEN_SETTINGS_XML() {
 }
 
 function maven_init_var_MAVEN_OPTS() {
-  export MAVEN_OPTS="${MAVEN_OPTS:-$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options)}"
+  export MAVEN_OPTS="${MAVEN_OPTS:-$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) -XX:MaxRAMPercentage=25.0}"
 }
 
 function maven_init_var_MAVEN_ARGS() {

tests/features/java/memory.feature

@@ -1,33 +1,43 @@
-@openjdk
-@redhat-openjdk-18
-@ubi8
 Feature: OPENJDK-559 JVM Memory tests
 
+  @ubi8
   Scenario: Check default JVM max heap configuration
     Given container is started as uid 1000
     Then container log should contain -XX:MaxRAMPercentage=80.0
 
+  @ubi8
   Scenario: Check configured JVM max heap configuration
     Given container is started with env
     | variable           | value  |
     | JAVA_MAX_MEM_RATIO | 90.0   |
     Then container log should contain -XX:MaxRAMPercentage=90.0
 
+  @ubi8
   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
   Scenario: Check configured JVM max heap configuration
     Given container is started with env
     | variable               | value  |
     | JAVA_INITIAL_MEM_RATIO | 25.0   |
     Then container log should contain -XX:InitialRAMPercentage=25.0
 
+  @ubi8
   Scenario: check JAVA_MAX_INITIAL_MEM overrides JAVA_INITIAL_MEM_RATIO
     Given container is started with env
     | variable               | value  |
     | JAVA_INITIAL_MEM_RATIO | 25.0   |
     | JAVA_MAX_INITIAL_MEM   | 4096m  |
     Then container log should contain -Xms4096m
     And  container log should not contain -XX:InitialRAMPercentage=25.0
+
+  # Not the runtime images
+  @ubi8/openjdk-8
+  @ubi8/openjdk-11
+  @ubi8/openjdk-17
+  Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
+    Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
+    Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$