Merge pull request #248 from luck3y/eap-cd-dev

[CLOUD-3122] - EAP CD - OpenJDK 11 / UBI

content_sets.yml

@@ -1,3 +1,4 @@
 x86_64:
-- rhel-server-rhscl-7-rpms
-- rhel-7-server-rpms
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
+

dev-overrides.yaml

@@ -11,11 +11,11 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: CD16
+                  ref: master
           - name: jboss-eap-7-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: CD16
+                  ref: eap-cd-dev
 
 osbs:
       repository:

image.yaml

@@ -3,7 +3,7 @@ schema_version: 1
 name: "jboss-eap-7/eap-cd-openshift"
 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"
+from: "ubi8:8.0"
 labels:
     - name: "com.redhat.component"
       value: "jboss-eap-7-eap-cd-openshift-container"
@@ -45,54 +45,51 @@ modules:
                   ref: eap-cd
       install:
           - name: jboss.container.openjdk.jdk
-            version: "8"
+            version: "11"
           - name: jboss.container.maven.35.bash
-            version: "3.5scl"
+            version: "3.5"
           - name: eap-cd-latest
           - name: dynamic-resources
-          - name: s2i-common
-          - name: java-alternatives
-          - name: os-eap-s2i
+          - name: jboss.container.eap.s2i.bash
           - name: os-java-jolokia
           - name: jboss.eap.cd.jolokia
           - name: os-eap7-openshift
-          - name: jboss.eap.cd16.openshift
+          - name: jboss.eap.config.openshift
+            version: "16.0-openjdk11"
           - name: jboss.eap.cd.openshift.modules
           - name: os-eap7-ping
           - name: os-eap-activemq-rar
             version: "1.1"
-          - name: os-java-run
+          - name: jboss.container.java.jvm.bash
           - name: os-eap-launch
           - name: os-eap7-launch
           - name: jboss.eap.cd.openshift.launch
+          - name: os-eap-datasource
+            version: "1.0"
           - name: jboss.eap.cd.logging
           - name: jboss.eap.config.mp-config
           - name: jboss.eap.config.jgroups
           - name: jboss.eap.config.elytron
           - name: jboss.eap.config.tracing
           - name: os-eap-probes
-            version: "1.0"
+            version: "2.0"
           - name: jboss-maven
-          - name: os-eap-db-drivers
           - name: os-eap-sso
           - name: os-eap70-sso
-          - name: os-java-hawkular
-          - name: os-eap70-hawkular
           - name: os-eap-hawkular
           - name: os-eap-deployment-scanner
           - name: os-eap-extensions
           - name: openshift-layer
           - name: openshift-passwd
           - name: os-logging
           - name: jboss.container.eap.prometheus.config
+            version: "7.2"
           - name: os-eap-txnrecovery.run
-            version: 'python2'
+            version: 'python3'
+          - name: os-eap-python
+            version: '3.6'
 packages:
       content_sets_file: content_sets.yml
-      install:
-          - python-requests
-          - python-enum34
-          - PyYAML
 run:
       user: 185
       cmd: