Merge pull request #387 from luck3y/CLOUD-3854

[CLOUD-3854] - EAP CD 21 builds
jboss-container-images · Nov 13, 2020 · a268793 · a268793
2 parents 46ec9b5 + 72220fe
commit a268793
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 15 deletions.
diff --git a/docs/README.adoc b/docs/README.adoc
@@ -24,8 +24,6 @@ toc::[levels=1]
 * link:./templates/eap-cd-starter-s2i.adoc[eap-cd-starter-s2i]
 * link:./templates/eap-cd-third-party-db-s2i.adoc[eap-cd-third-party-db-s2i]
 * link:./templates/eap-cd-tx-recovery-s2i.adoc[eap-cd-tx-recovery-s2i]
-* link:./templates/sso-eap.adoc[sso-eap]
-* link:./templates/t2.adoc[t2]
 
 ////
   the source for the release notes part of this page is in the file

diff --git a/image.yaml b/image.yaml
@@ -2,8 +2,8 @@ schema_version: 1
 
 name: "jboss-eap-7-tech-preview/eap-cd-openshift-rhel8"
 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: "20.0"
-from: "ubi8:8-released"
+version: "21.0"
+from: "registry.redhat.io/ubi8/ubi:latest"
 labels:
     - name: "com.redhat.component"
       value: "jboss-eap-7-eap-cd-openshift-rhel8-container"
@@ -38,15 +38,15 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: CD20_CR2
+                  ref: CD21_CR1
           - name: jboss-eap-7-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: CD20_CR2
+                  ref: CD21_CR1
           - name: wildfly-cekit-modules
             git:
                   url: https://github.com/wildfly/wildfly-cekit-modules.git
-                  ref: 0.20.0
+                  ref: 0.21.1
       install:
           - name: jboss.container.openjdk.jdk
             version: "11"
@@ -122,7 +122,7 @@ packages:
 artifacts:
   - name: maven-repo
     target: maven-repo.zip
-    md5: 5b22a9b4008f827bac5947f255e433b0
+    md5: 64ca2e15c57b4e5a273233b53bc758f3
 
 run:
       user: 185

diff --git a/runtime-image/image.yaml b/runtime-image/image.yaml
@@ -2,8 +2,8 @@ schema_version: 1
 
 name: "jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8"
 description: "The JBoss EAP continuous delivery (JBoss EAP CD) releases are intended to be Technology Preview - The JBoss EAP CD OpenShift runtime 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: "20.0"
-from: "ubi8:8-released"
+version: "21.0"
+from: "registry.redhat.io/ubi8/ubi:latest"
 labels:
     - name: "com.redhat.component"
       value: "jboss-eap-7-eap-cd-runtime-openshift-rhel8-container"
@@ -50,7 +50,7 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: CD20_CR2
+                  ref: CD21_CR1
       install:
           - name: jboss.container.openjdk.jdk
             version: "11"

diff --git a/templates/eap-cd-image-stream.json b/templates/eap-cd-image-stream.json
@@ -17,11 +17,11 @@
                 "annotations": {
                     "openshift.io/display-name": "JBoss EAP continuous delivery",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
-                    "version": "20.0"
+                    "version": "21.0"
                 }
             },
             "labels": {
-                "xpaas": "20.0"
+                "xpaas": "21.0"
             },
             "spec": {
                 "tags": [
@@ -46,6 +46,28 @@
                             "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "name": "21",
+                        "annotations": {
+                            "description": "JBoss EAP continuous delivery Tech Preview version 21.",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.4,javaee:8,java:11",
+                            "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "openshift",
+                            "version": "21",
+                            "openshift.io/display-name": "JBoss EAP continuous delivery 21 (Tech Preview)"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "ImageStreamTag",
+                            "name": "21.0"
+
+                        }
+                    },
                     {
                         "name": "20",
                         "annotations": {
@@ -432,6 +454,27 @@
                             "kind": "DockerImage",
                             "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:20.0"
                         }
+                    },
+                    {
+                        "name": "21.0",
+                        "annotations": {
+                            "description": "JBoss EAP continuous delivery 21 Tech Preview S2I Image",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.4,javaee:8,java:11",
+                            "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "openshift",
+                            "version": "21.0",
+                            "openshift.io/display-name": "JBoss EAP continuous delivery 21 (Tech Preview)"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:21.0"
+                        }
                     }
                 ]
             }
@@ -444,11 +487,11 @@
                 "annotations": {
                     "openshift.io/display-name": "JBoss EAP continuous delivery runtime image",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
-                    "version": "20.0"
+                    "version": "21.0"
                 }
             },
             "labels": {
-                "xpaas": "20.0"
+                "xpaas": "21.0"
             },
             "spec": {
                 "tags": [
@@ -470,6 +513,25 @@
                             "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "name": "21",
+                        "annotations": {
+                            "description": "JBoss EAP continuous delivery runtime image version 21 [Tech Preview]",
+                            "iconClass": "icon-eap",
+                            "tags": "eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.4,javaee:8,java:11",
+                            "version": "21",
+                            "openshift.io/display-name": "JBoss EAP continuous delivery 21 (Tech Preview)"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "ImageStreamTag",
+                            "name": "21.0"
+
+                        }
+                    },
                     {
                         "name": "20",
                         "annotations": {
@@ -583,6 +645,25 @@
                             "kind": "DockerImage",
                             "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:20.0"
                         }
+                    },
+                    {
+                        "name": "21.0",
+                        "annotations": {
+                            "description": "JBoss EAP continuous delivery 21 runtime image [Tech Preview]",
+                            "iconClass": "icon-eap",
+                            "tags": "eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.4,javaee:8,java:11",
+
+                            "version": "21.0",
+                            "openshift.io/display-name": "JBoss EAP continuous delivery 21 (Tech Preview)"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:21.0"
+                        }
                     }
                 ]
             }