CIAM-2174 Merge container builds to one multiarch build and use OpenJDK for all architectures

Author: drichtarik

image.yaml

@@ -137,10 +137,6 @@ modules:
           # See eg. https://access.redhat.com/solutions/3402171 for details how to use
           - name: sso-cli-extensions
 
-          # Ensure RPMs belonging to counterpart JVM are removed
-          - name: sso-rm-openjdk
-            version: *jdk_version
-
           # Various SSO image pre-launch checks to prevent regressions
           - name: sso-pre-launch-checks
 

modules/sso/sso-jdk/11/configure.sh

@@ -17,23 +17,15 @@ pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
 
-# Set this JDK as the alternative in use
-if [[ ($(uname -i) = ppc64le) || ($(uname -i) = s390x) ]]
-then
-  alternatives --set java /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/java
-  alternatives --set javac /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/javac
-  JAVA_SECURITY_FILE=/usr/lib/jvm/ibm-semeru-open-11-jdk/conf/security/java.security
-  JAVA_HOME=/usr/lib/jvm/ibm-semeru-open-11-jdk/
-else
-  _arch="$(uname -i)"
-  alternatives --set java java-11-openjdk.${_arch}
-  alternatives --set javac java-11-openjdk.${_arch}
-  alternatives --set java_sdk_openjdk java-11-openjdk.${_arch}
-  alternatives --set jre_openjdk java-11-openjdk.${_arch}
-  JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
-  JAVA_HOME=/usr/lib/jvm/java-11/
-fi
+_arch="$(uname -i)"
+alternatives --set java java-11-openjdk.${_arch}
+alternatives --set javac java-11-openjdk.${_arch}
+alternatives --set java_sdk_openjdk java-11-openjdk.${_arch}
+alternatives --set jre_openjdk java-11-openjdk.${_arch}
 
+# Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
+JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
+JAVA_HOME=/usr/lib/jvm/java-11/
 # Update securerandom.source for quicker starts (must be done after removing jdk 11, or it will hit the wrong files)
 SECURERANDOM=securerandom.source
 if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then

modules/sso/sso-jdk/11/module.yaml

@@ -19,7 +19,7 @@ envs:
 
 packages:
   install:
-    - "`[[ ($(uname -i) = ppc64le) || ($(uname -i) = s390x) ]] && echo ibm-semeru-open-11-jdk || echo java-11-openjdk-devel`"
+    - java-11-openjdk-devel
     - unzip
 
 execute:

modules/sso/sso-rm-openjdk/11/configure.sh

@@ -3,14 +3,6 @@ schema_version: 1
 name: "rh-sso-7/sso75-openj9-openshift-rhel8"
 description: "Red Hat Single Sign-On 7.5 on OpenJ9 OpenShift container image, based on the Red Hat Universal Base Image 8 Minimal container image"
 
-envs:
-    - name: "JAVA_SECURITY_FILE"
-      value: "/usr/lib/jvm/ibm-semeru-open-11-jdk/conf/security/java.security"
-    - name: "JAVA_HOME"
-      value: "/usr/lib/jvm/ibm-semeru-open-11-jdk/"
-    - name: "OPENJ9_JAVA_OPTIONS"
-      value: "-Xjit:{java/lang/invoke/AsTypeHandle.invokeExact_thunkArchetype*}(dontInline={java/lang/invoke/VirtualHandle.invokeExact_thunkArchetype*})"
-
 labels:
     - name: "com.redhat.component"
       value: "redhat-sso-7-sso75-openj9-openshift-rhel8-container"

modules/sso/sso-rm-openjdk/11/module.yaml

@@ -3,12 +3,6 @@ schema_version: 1
 name: "rh-sso-7/sso75-openshift-rhel8"
 description: "Red Hat Single Sign-On 7.5 on OpenJDK OpenShift container image, based on the Red Hat Universal Base Image 8 Minimal container image"
 
-envs:
-    - name: "JAVA_SECURITY_FILE"
-      value: "/usr/lib/jvm/java/conf/security/java.security"
-    - name: "JAVA_HOME"
-      value: "/usr/lib/jvm/java-11/"
-
 labels:
     - name: "com.redhat.component"
       value: "redhat-sso-7-sso75-openshift-rhel8-container"
@@ -24,6 +18,8 @@ osbs:
                 platforms:
                   only:
                   - x86_64
+                  - s390x
+                  - ppc64le
       repository:
             name: containers/redhat-sso-7
             branch: rh-sso-7.5-rhel-8