Merge pull request #213 from drichtarik/sso75-dev

Use IBM semeru java

Author: drichtarik

image.yaml

@@ -25,7 +25,6 @@ labels:
       value: "sso,sso75,keycloak"
     - name: "io.openshift.s2i.scripts-url"
       value: "image:///usr/local/s2i"
-
 envs:
     - name: "JBOSS_PRODUCT"
       value: *product
@@ -67,16 +66,14 @@ envs:
     - name: "SCRIPT_DEBUG"
       description: "If set to true, ensurses that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed."
       example: "true"
-
 ports:
     - value: 8443
-
 modules:
       repositories:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: 0.45.2
+                  ref: 0.45.3
 
           - name: jboss-eap-modules
             git:
@@ -97,6 +94,8 @@ modules:
             path: modules
 
       install:
+          - name: sso.security.cve-2020-10695
+            version: '1.0'
           # Install JDK runtime
           - name: sso-jdk
             version: &jdk_version '11'
@@ -132,6 +131,9 @@ modules:
 packages:
       manager: microdnf
       content_sets_file: content_sets.yaml
+      install:
+      - which
+      - unzip
 
 run:
       cmd:

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

@@ -14,15 +14,23 @@ cp -pr * /
 popd
 
 # Set this JDK as the alternative in use
-_arch="$(uname -i)"
-_v=`[[ ($(uname -i) = ppc64le) || ($(uname -i) = s390x) ]] && echo openj9 || echo openjdk`
-alternatives --set java java-11-${_v}.${_arch}
-alternatives --set javac java-11-${_v}.${_arch}
-alternatives --set java_sdk_${_v} java-11-${_v}.${_arch}
-alternatives --set jre_${_v} java-11-${_v}.${_arch}
+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
 
 # Update securerandom.source for quicker starts (must be done after removing jdk 11, or it will hit the wrong files)
-JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
 SECURERANDOM=securerandom.source
 if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
     sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE

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

@@ -12,23 +12,15 @@ labels:
   value: *jdk_version
 
 envs:
-- name: "JAVA_HOME"
-  value: "/usr/lib/jvm/java-11"
-- name: "JAVA_VENDOR"
-  value: "openjdk"
 - name: "JAVA_VERSION"
   value: *jdk_version
 - name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE
   value: /opt/jboss/container/openjdk/jdk
 
 packages:
   install:
-  - java-11-`[[ ($(uname -i) = ppc64le) || ($(uname -i) = s390x) ]] && echo openj9 || echo openjdk`-devel
-
-modules:
-  install:
-  - name: sso.security.cve-2020-10695
-    version: '1.0'
+    - "`[[ ($(uname -i) = ppc64le) || ($(uname -i) = s390x) ]] && echo ibm-semeru-open-11-jdk || echo java-11-openjdk-devel`"
+    - unzip
 
 execute:
 - script: configure.sh

modules/sso/sso-jdk/8/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -2,19 +2,8 @@
 set -u
 set -e
 
-## Work around https://bugzilla.redhat.com/show_bug.cgi?id=1797054
-if rpm -q java-1.8.0-openjdk-headless && ( rpm -q java-11-openjdk-devel || rpm -q java-11-openj9-devel ); then
-    for pkg in java-1.8.0-openjdk-devel \
-           java-1.8.0-openjdk-headless \
-           java-1.8.0-openjdk; do
-        if rpm -q "$pkg"; then
-            rpm -e --nodeps "$pkg"
-        fi
-    done
-fi
-
 ## Work around OpenJDK being installed as dependency. https://bugzilla.redhat.com/show_bug.cgi?id=1762827 and similar
-if rpm -q java-11-openj9-devel; then
+if rpm -q ibm-semeru-open-11-jdk || rpm -q java-11-openj9-devel; then
     for pkg in java-11-openjdk-devel \
            java-11-openjdk-headless \
            java-11-openjdk; do

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

@@ -3,6 +3,12 @@ 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/"
+
 labels:
     - name: "com.redhat.component"
       value: "redhat-sso-7-sso75-openj9-openshift-rhel8-container"
@@ -14,10 +20,6 @@ osbs:
                 compose:
                   pulp_repos: true
                   # include_unpublished_pulp_repos: true
-                  # packages:
-                  # - java-11-openj9
-                  # - java-11-openj9-headless
-                  # - java-11-openj9-devel
                   signing_intent: release
                   inherit: true
                 platforms: