CLOUD-3860 EAP XP 2.0 OpenShift Image

jboss-container-images · Dec 8, 2020 · 9834b7f · 9834b7f
1 parent 10c4490
commit 9834b7f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/eap-xp/image.yaml b/eap-xp/image.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 
-name: "jboss-eap-7/eap-xp1-openjdk11-openshift-rhel8"
-description: "Red Hat JBoss Enterprise Application Platform XP 1.0 OpenShift container image."
-version: "1.0"
+name: "jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift container image."
+version: "2.0"
 from: "registry.redhat.io/ubi8/ubi:latest"
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-xp1-openjdk11-openshift-rhel8-container"
+      value: "jboss-eap-7-xp2-openjdk11-openshift-rhel8-container"
     - name: "io.k8s.description"
-      value: "Platform for building and running JavaEE applications on JBoss EAP XP 1.0"
+      value: "Platform for building and running JavaEE applications on JBoss EAP XP 2.0"
     - name: "io.k8s.display-name"
       value: "JBoss EAP XP"
     - name: "io.openshift.expose-services"
@@ -36,11 +36,11 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: EAP_734_CR2
+                  ref: EAP_XP_2_CR1
           - name: jboss-eap-7-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP_734_CR2
+                  ref: EAP_XP_2_CR1
           - name: wildfly-cekit-modules
             git:
                   url: https://github.com/wildfly/wildfly-cekit-modules.git
@@ -50,8 +50,8 @@ modules:
             version: "11"
           - name: jboss.container.maven.35.bash
             version: "3.5"
-          - name: eap-xp-10-env
-            version: "1.0.3"
+          - name: eap-xp-20-env
+            version: "2.0.0"
           - name: jboss.container.eap.setup
           - name: eap-install-cleanup
           # This one indirectly installs common logging by creating a link to $BIN_HOME/bin/launch
@@ -121,7 +121,7 @@ modules:
 artifacts:
   - name: maven-repo
     target: maven-repo.zip
-    md5: 5909f9a1d68932f6eacf1ed903d0f9f1
+    md5: 4332f2181b4cd378bd3e360610020e69
 
 run:
       user: 185
@@ -131,5 +131,5 @@ osbs:
       configuration:
             container_file: container.yaml
       repository:
-            name: containers/jboss-eap-xp-openjdk11-builder
+            name: containers/jboss-eap-xp2-openjdk11-builder
             branch: jb-eap-7.3-openshift-rhel-8
diff --git a/eap-xp/rel-jdk11-xp-overrides.yaml b/eap-xp/rel-jdk11-xp-overrides.yaml
@@ -13,5 +13,5 @@ packages:
 
 osbs:
       repository:
-            name:  containers/jboss-eap-xp-openjdk11-builder
+            name:  containers/jboss-eap-xp2-openjdk11-builder
             branch: jb-eap-7.3-openshift-rhel-8
diff --git a/eap-xp/rel-jdk8-xp-overrides.yaml b/eap-xp/rel-jdk8-xp-overrides.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 
-name: "jboss-eap-7/eap-xp1-openjdk8-openshift-rhel7"
+name: "jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
 from: "registry.redhat.io/ubi7/ubi:latest"
 
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-xp1-openjdk8-openshift-rhel7-container"
+      value: "jboss-eap-7-xp2-openjdk8-openshift-rhel7-container"
 
 modules:
       install:
@@ -26,7 +26,7 @@ packages:
 
 osbs:
       repository:
-            name: containers/jboss-eap-xp-openjdk8-builder
+            name: containers/jboss-eap-xp2-openjdk8-builder
             branch: jb-eap-7.3-openshift-rhel-7
 
 
diff --git a/eap-xp/runtime-image/image.yaml b/eap-xp/runtime-image/image.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 
-name: "jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8"
-description: "Red Hat JBoss Enterprise Application Platform XP 1.0 OpenShift runtime image with OpenJDK 11"
-version: "1.0"
+name: "jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift runtime image with OpenJDK 11"
+version: "2.0"
 from: "registry.redhat.io/ubi8/ubi:latest"
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-xp1-openjdk11-runtime-openshift-rhel8-container"
+      value: "jboss-eap-7-xp2-openjdk11-runtime-openshift-rhel8-container"
     - name: "io.k8s.description"
       value: "Base runtime image to run EAP XP server and application"
     - name: "io.k8s.display-name"
@@ -50,7 +50,7 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: EAP_734_CR2
+                  ref: EAP_XP_2_CR1
       install:
           - name: jboss.container.openjdk.jdk
             version: "11"
@@ -69,6 +69,6 @@ osbs:
       configuration:
             container_file: ../container.yaml
       repository:
-            name: containers/jboss-eap-xp-openjdk11-runtime
+            name: containers/jboss-eap-xp2-openjdk11-runtime
             branch: jb-eap-7.3-openshift-rhel-8
 
diff --git a/eap-xp/runtime-image/rel-jdk8-xp-overrides.yaml b/eap-xp/runtime-image/rel-jdk8-xp-overrides.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 
-name: "jboss-eap-7/eap-xp1-openjdk8-runtime-openshift-rhel7"
-description: "Red Hat JBoss Enterprise Application Platform XP 1.0 OpenShift runtime image with OpenJDK 8"
+name: "jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift runtime image with OpenJDK 8"
 from: "registry.redhat.io/ubi7/ubi:latest"
 
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-xp1-openjdk8-runtime-openshift-rhel7-container"
+      value: "jboss-eap-7-xp2-openjdk8-runtime-openshift-rhel7-container"
 envs:
     # env var set by modules in the builder image context, duplicating them here.
     # CLOUD-3466 - add com.sun.crypto.provider for JDK8
@@ -30,5 +30,5 @@ osbs:
       configuration:
             container_file: ../container.yaml
       repository:
-            name: containers/jboss-eap-xp-openjdk8-runtime
+            name: containers/jboss-eap-xp2-openjdk8-runtime
             branch: jb-eap-7.3-openshift-rhel-7
diff --git a/eap-xp/runtime-image/test/Dockerfile b/eap-xp/runtime-image/test/Dockerfile
@@ -1,5 +1,5 @@
 #Be sure to update eap-testapp with the name of the image generated with s2i.
-FROM jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8
+FROM jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8
 COPY --from=eap-testapp:latest /s2i-output/server $JBOSS_HOME
 USER root
 RUN chown -R jboss:root $JBOSS_HOME && chmod -R ug+rwX $JBOSS_HOME

diff --git a/eap-xp/tests/features/basic.feature b/eap-xp/tests/features/basic.feature
@@ -4,11 +4,11 @@ Feature: EAP XP common tests
   # https://issues.jboss.org/browse/CLOUD-180
   Scenario: Check if image version and release is printed on boot
     When container is ready
-    Then container log should contain Running jboss-eap-7/eap-xp1-openjdk11-openshift-rhel8 image, version
+    Then container log should contain Running jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8 image, version
 
   Scenario: Check that the labels are correctly set
     Given image is built
-    Then the image should contain label com.redhat.component with value jboss-eap-7-eap-xp1-openjdk11-openshift-rhel8-container
-    And the image should contain label name with value jboss-eap-7/eap-xp1-openjdk11-openshift-rhel8
+    Then the image should contain label com.redhat.component with value jboss-eap-7-eap-xp2-openjdk11-openshift-rhel8-container
+    And the image should contain label name with value jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.openshift.tags with value builder,javaee,eap,eap7,eap-xp