From 79dce9622e28f3f9e73d7bfdca07292a1a7d9631 Mon Sep 17 00:00:00 2001 From: Ettore Leandro Tognoli Date: Tue, 15 Mar 2022 09:16:00 -0300 Subject: [PATCH] [CLOUD-4088] Update files for 7.4.4.GA-CR1 --- modules/eap-74-env/7.4.4/module.yaml | 46 +++++++++++++++++++ modules/eap-74-galleon-latest/module.yaml | 4 +- .../wildfly-user-feature-pack-build.xml | 32 +++++++++++++ modules/eap-74-galleon/7.4.4/configure.sh | 13 ++++++ modules/eap-74-galleon/7.4.4/module.yaml | 12 +++++ modules/eap-74-latest/module.yaml | 6 +-- modules/eap-744/install.sh | 14 ++++++ modules/eap-744/module.yaml | 23 ++++++++++ 8 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 modules/eap-74-env/7.4.4/module.yaml create mode 100644 modules/eap-74-galleon/7.4.4/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml create mode 100644 modules/eap-74-galleon/7.4.4/configure.sh create mode 100644 modules/eap-74-galleon/7.4.4/module.yaml create mode 100755 modules/eap-744/install.sh create mode 100644 modules/eap-744/module.yaml diff --git a/modules/eap-74-env/7.4.4/module.yaml b/modules/eap-74-env/7.4.4/module.yaml new file mode 100644 index 0000000..4204c4a --- /dev/null +++ b/modules/eap-74-env/7.4.4/module.yaml @@ -0,0 +1,46 @@ +schema_version: 1 + +name: "eap-74-env" +description: "JBoss Enterprise Application Platform 7.4.4 env and labels" +version: "7.4.4" + +labels: + - name: "org.jboss.product" + value: "eap" + - name: "org.jboss.product.version" + value: "7.4.4" + - name: "org.jboss.product.eap.version" + value: "7.4.4" + - name: "com.redhat.deployments-dir" + value: "/opt/eap/standalone/deployments" + - name: "com.redhat.dev-mode" + value: "DEBUG:true" + description: "Environment variable used to enable development mode (debugging). A value of true will enable development mode." + - name: "com.redhat.dev-mode.port" + value: "DEBUG_PORT:8787" + description: "Environment variable used to specify the debug port. If not set, the default EAP debug port will be used (8787). Only applicable when development mode is enabled." +envs: + - name: "WILDFLY_VERSION" + value: "7.4.4.GA-redhat-00010" + - name: "LAUNCH_JBOSS_IN_BACKGROUND" + value: "true" + - name: "JBOSS_PRODUCT" + value: "eap" + - name: "JBOSS_EAP_VERSION" + value: "7.4.4" + - name: "PRODUCT_VERSION" + value: "7.4.4" + - name: "EAP_FULL_GROUPID" + value: "org.jboss.eap" + - name: "JBOSS_HOME" + value: "/opt/eap" + - name: "DEBUG" + example: "true" + description: "Specify true to enable development mode (debugging)." + - name: "DEBUG_PORT" + example: "8787" + description: "Specify the port to use for debugging. If not set, the default EAP debug port will be used (8787). Only applicable when development mode is enabled." +ports: + - value: 8080 + - value: 8787 + expose: false diff --git a/modules/eap-74-galleon-latest/module.yaml b/modules/eap-74-galleon-latest/module.yaml index 07aaf0a..8c50ae1 100644 --- a/modules/eap-74-galleon-latest/module.yaml +++ b/modules/eap-74-galleon-latest/module.yaml @@ -2,8 +2,8 @@ schema_version: 1 name: eap-74-galleon-latest version: "1.0" -description: "Red Hat JBoss Enterprise Application Platform EAP 7.4.3 latest version galleon module" +description: "Red Hat JBoss Enterprise Application Platform EAP 7.4.4 latest version galleon module" modules: install: - name: eap-74-galleon - version: '7.4.3' + version: '7.4.4' diff --git a/modules/eap-74-galleon/7.4.4/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml b/modules/eap-74-galleon/7.4.4/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml new file mode 100644 index 0000000..530df16 --- /dev/null +++ b/modules/eap-74-galleon/7.4.4/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml @@ -0,0 +1,32 @@ + + + + + + org.wildfly:wildfly-ee-galleon-pack + + + + + + diff --git a/modules/eap-74-galleon/7.4.4/configure.sh b/modules/eap-74-galleon/7.4.4/configure.sh new file mode 100644 index 0000000..7c87398 --- /dev/null +++ b/modules/eap-74-galleon/7.4.4/configure.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Configure module +set -e + +SCRIPT_DIR=$(dirname $0) +ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts + +chown -R jboss:root $SCRIPT_DIR +chmod -R ug+rwX $SCRIPT_DIR + +pushd ${ARTIFACTS_DIR} +cp -pr * / +popd diff --git a/modules/eap-74-galleon/7.4.4/module.yaml b/modules/eap-74-galleon/7.4.4/module.yaml new file mode 100644 index 0000000..f3a5f9d --- /dev/null +++ b/modules/eap-74-galleon/7.4.4/module.yaml @@ -0,0 +1,12 @@ +schema_version: 1 +name: eap-74-galleon +version: '7.4.4' +description: Install Galleon feature-pack-build file with dependency on wildfly-galleon-pack, default config being inherited from wildfly-ee-galleon-pack + +execute: +- script: configure.sh + +modules: + install: + - name: eap-74-env + version: '7.4.4' diff --git a/modules/eap-74-latest/module.yaml b/modules/eap-74-latest/module.yaml index ded23fb..7279346 100644 --- a/modules/eap-74-latest/module.yaml +++ b/modules/eap-74-latest/module.yaml @@ -6,7 +6,7 @@ description: "Red Hat JBoss Enterprise Application Platform EAP 7.4 latest versi modules: install: - name: eap-74-env - version: '7.4.3' - - name: eap-743 - version: '7.4.3' + version: '7.4.4' + - name: eap-744 + version: '7.4.4' - name: eap-install-cleanup diff --git a/modules/eap-744/install.sh b/modules/eap-744/install.sh new file mode 100755 index 0000000..948ae2a --- /dev/null +++ b/modules/eap-744/install.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +SOURCES_DIR=/tmp/artifacts/ +DISTRIBUTION_ZIP="jboss-eap-7.4.zip" + +unzip -d $SOURCES_DIR/eap-dist -q $SOURCES_DIR/$DISTRIBUTION_ZIP +DIST_NAME=`ls $SOURCES_DIR/eap-dist` + +mv $SOURCES_DIR/eap-dist/$DIST_NAME $JBOSS_HOME + +export JAVA_OPTS="${JAVA_OPTS} -Dorg.wildfly.patching.jar.invalidation=true" +$JBOSS_HOME/bin/jboss-cli.sh --command="patch apply $SOURCES_DIR/jboss-eap-7.4.4-patch.zip" diff --git a/modules/eap-744/module.yaml b/modules/eap-744/module.yaml new file mode 100644 index 0000000..40e8e26 --- /dev/null +++ b/modules/eap-744/module.yaml @@ -0,0 +1,23 @@ +schema_version: 1 + +name: eap-744 +version: "7.4.4" + +artifacts: + - name: jboss-eap-7.4.zip + target: jboss-eap-7.4.zip + md5: 58263e1daa0f08e457cd3cddb93ec49a + + - name: jboss-eap-7.4.4-patch + target: jboss-eap-7.4.4-patch.zip + md5: 613dad1a9bbd6ea2224ae484f52aab25 + +run: + user: 185 + cmd: + - "/opt/eap/bin/standalone.sh" + - "-b" + - "0.0.0.0" + +execute: + - script: install.sh