Merge pull request #245 from drichtarik/sso75-dev

CIAM-2825 7.5.2 patch Build OCP images

Author: drichtarik

image.yaml

@@ -78,12 +78,12 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: EAP_743_CR3
+                  ref: EAP_744_CR2
 
           - name: jboss-eap-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP_743_CR3
+                  ref: EAP_744_CR2
 
           - name: wildfly-cekit-modules
             git:

modules/eap/setup/eap/modules/module.yaml

@@ -31,8 +31,8 @@ ports:
 artifacts:
 - name: eap-image-maven-repo
   target: maven-repo.zip
-  md5: 2c0ab034200cafbffb0b808bf2f59e67
-  url: http://$DOWNLOAD_SERVER/released/middleware/eap7/7.4.3/jboss-eap-7.4.3-image-builder-maven-repository.zip
+  md5: f09134d49bcee9a583ec3d2d9402f8c2
+  url: http://$DOWNLOAD_SERVER/released/middleware/eap7/7.4.4/jboss-eap-7.4.4-image-builder-maven-repository.zip
 # RHSSO-1824: Update RH-SSO server overlay to 'RH-SSO 7.5.2.CR1' build
 - name: keycloak-server-overlay.zip
   md5: 7ea126bb6d903c88727fa3636150c63a
@@ -72,9 +72,9 @@ labels:
 - name: "org.jboss.product"
   value: "eap"
 - name: "org.jboss.product.version"
-  value: "7.4.3"
+  value: "7.4.4"
 - name: "org.jboss.product.eap.version"
-  value: "7.4.3"
+  value: "7.4.4"
 - name: "com.redhat.deployments-dir"
   value: "/opt/eap/standalone/deployments"
 - name: "com.redhat.dev-mode"
@@ -94,15 +94,15 @@ labels:
 envs:
 - name: "WILDFLY_VERSION"
   description: "Mandatory. WildFly server version."
-  value: "7.4.3.GA-redhat-00002"
+  value: "7.4.4.GA-redhat-00011"
 - name: "LAUNCH_JBOSS_IN_BACKGROUND"
   value: "true"
 - name: "JBOSS_PRODUCT"
   value: "eap"
 - name: "JBOSS_EAP_VERSION"
-  value: "7.4.3"
+  value: "7.4.4"
 - name: "PRODUCT_VERSION"
-  value: "7.4.3"
+  value: "7.4.4"
 - name: "EAP_FULL_GROUPID"
   value: "org.jboss.eap"
 - name: "JBOSS_HOME"

modules/sso/apply/patches/module.yaml

@@ -2,20 +2,14 @@ schema_version: 1
 name: sso.apply.patches
 version: '1.0'
 description: Module to apply any possibly needed EAP / RH-SSO one-off patches via jboss-cli.sh
-#execute:
-#- script: apply-eap-rh-sso-one-off-patches.sh
-#
-#artifacts:
-## CIAM-1975
-#- md5: 8f54d950472fb9abf34e2f965303a5fc
-#  name: rhsso-1974.zip
-#  target: eap-one-off-rhsso-1974.zip
-#  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-1974.zip
-## CIAM-2055
-#- md5: e131a6a7ab26779951981665b9e63919
-#  name: rhsso-2054.zip
-#  target: eap-one-off-rhsso-2054.zip
-#  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-2054.zip
+execute:
+- script: apply-eap-rh-sso-one-off-patches.sh
+artifacts:
+## CIAM-2657
+- md5: 0925d9b712d75e1d12f8efa40bcc54ca
+  name: rhsso-2657.zip
+  target: rhsso-2657.zip
+  url: http://$DOWNLOAD_SERVER/devel/candidates/JBSSO/JBSSO-7.5.2-CIAM-2657-patch/rhsso-2657.zip
 
 # Note:
 #

modules/sso/sso-pre-launch-checks/added/sso_image_pre_launch_checks.sh

@@ -12,6 +12,7 @@ function postConfigure() {
   verify_CIAM_1757_fix_present
   #verify_CIAM_1975_fix_present
   #verify_CIAM_2055_fix_present
+  verify_CIAM_2657_fix_present
 }
 
 # KEYCLOAK-13585 / RH BZ#1817530 / CVE-2020-10695:
@@ -105,3 +106,13 @@ function verify_CIAM_2055_fix_present() {
     exit "${errorExitCode}"
   fi
 }
+
+function verify_CIAM_2657_fix_present() {
+  local -r errorExitCode="1"
+  if ! find "${JBOSS_HOME}"/modules/system/layers -name '*-rhsso-2657.jar' 2> /dev/null | grep -q .
+  then
+    log_error "The CIAM-2657 one-off patch wasn't properly installed."
+    log_error "Cannot start the '${JBOSS_IMAGE_NAME}', version '${JBOSS_IMAGE_VERSION}'!"
+    exit "${errorExitCode}"
+  fi
+}