Skip to content

Commit

Permalink
CLOUD-3299 Update EAP CD to EAP CD17
Browse files Browse the repository at this point in the history
fix version
  • Loading branch information
luck3y committed Jul 10, 2019
1 parent cea126f commit 1e816f6
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 13 deletions.
7 changes: 3 additions & 4 deletions content_sets.yml
@@ -1,5 +1,4 @@
ppc64le:
- rhel-7-server-for-power-le-rhscl-rpms
- rhel-7-for-power-le-rpms
x86_64:
- rhel-7-server-rpms
- rhel-8-for-x86_64-baseos-rpms
- rhel-8-for-x86_64-appstream-rpms

2 changes: 1 addition & 1 deletion cp-overrides.yaml
Expand Up @@ -22,5 +22,5 @@ artifacts:
osbs:
repository:
name: containers/jboss-eap-7
branch: jb-eap-7.3-cd-cp-rhel-7
branch: jb-eap-7.3-cd-cp-rhel-8

2 changes: 1 addition & 1 deletion dev-overrides.yaml
Expand Up @@ -32,5 +32,5 @@ schema_version: 1
osbs:
repository:
name: containers/jboss-eap-7
branch: jb-eap-7.3-cd-dev-rhel-7
branch: jb-eap-7.3-cd-dev-rhel-8

12 changes: 7 additions & 5 deletions image.yaml
Expand Up @@ -2,11 +2,11 @@ schema_version: 1

name: "jboss-eap-7/eap-cd"
description: "The JBoss EAP continuous delivery (JBoss EAP CD) releases are intended to be Technology Preview - The JBoss EAP CD OpenShift container image is provided as technology preview. It is intended for development use only. It should NOT be deployed on production or in environments that are not intended for development use."
version: "16.0"
from: "rhel7:7-released"
version: "17.0"
from: "ubi8:8-released"
labels:
- name: "com.redhat.component"
value: "jboss-eap-7-eap-cd-container"
value: "jboss-eap-7-eap-cd-rhel8-container"

packages:
content_sets_file: content_sets.yml
Expand All @@ -20,12 +20,14 @@ modules:
- path: modules
install:
- name: jboss.container.openjdk.jdk
version: "8"
version: "11"
- name: jboss.container.maven.35.bash
version: "3.5"
- name: eap-cd-latest

osbs:
configuration:
container_file: container.yaml
repository:
name: containers/jboss-eap-7
branch: jb-eap-7.3-cd-rhel-7
branch: jb-eap-7.3-cd-rhel-8
12 changes: 12 additions & 0 deletions modules/cd-17/install.sh
@@ -0,0 +1,12 @@
#!/bin/sh

set -e

SOURCES_DIR=/tmp/artifacts/
DISTRIBUTION_ZIP="jboss-eap-cd.zip"

unzip -d $SOURCES_DIR/eap-cd-dist -q $SOURCES_DIR/$DISTRIBUTION_ZIP
DIST_NAME=`ls $SOURCES_DIR/eap-cd-dist`

mv $SOURCES_DIR/eap-cd-dist/$DIST_NAME $JBOSS_HOME

58 changes: 58 additions & 0 deletions modules/cd-17/module.yaml
@@ -0,0 +1,58 @@
schema_version: 1

name: "eap-cd-17"
description: "JBoss Enterprise Application Platform CD 17 install"
labels:
- name: "com.redhat.component"
value: "jboss-eap-7-eap-cd-container"
- name: "org.jboss.product"
value: "eap"
- name: "org.jboss.product.version"
value: "7.3.0"
- name: "org.jboss.product.eap.version"
value: "7.3.0"
- 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: "LAUNCH_JBOSS_IN_BACKGROUND"
value: "true"
- name: "JBOSS_PRODUCT"
value: "eap"
- name: "JBOSS_EAP_VERSION"
value: "7.3.0-cd"
- name: "PRODUCT_VERSION"
value: "17.0"
- 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

artifacts:
- name: jboss-eap-cd.zip
target: jboss-eap-cd.zip
md5: 28a2da813ce9b7ee31977046326b8e27

run:
user: 185
cmd:
- "/opt/eap/bin/standalone.sh"
- "-b"
- "0.0.0.0"

execute:
- script: install.sh

2 changes: 1 addition & 1 deletion modules/cd-latest/module.yaml
Expand Up @@ -4,5 +4,5 @@ name: eap-cd-latest
description: "Red Hat JBoss Enterprise Application Platform CD latest version install module"
modules:
install:
- name: eap-cd-16
- name: eap-cd-17
- name: eap-install-cleanup
2 changes: 1 addition & 1 deletion rel-overrides.yaml
Expand Up @@ -12,5 +12,5 @@ schema_version: 1
osbs:
repository:
name: containers/jboss-eap-7
branch: jb-eap-7.3-cd-rhel-7
branch: jb-eap-7.3-cd-rhel-8

0 comments on commit 1e816f6

Please sign in to comment.