Merge pull request #409 from luck3y/fix_s390x

Update for s390x/ppc64le builds on new brew targets and correct new cct_module j9 install
jboss-container-images · Mar 4, 2021 · a9b88dc · a9b88dc
2 parents f71b5c7 + 06355a0
commit a9b88dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/rel-j9-11-overrides.yaml b/rel-j9-11-overrides.yaml
@@ -13,9 +13,16 @@ modules:
             version: "osbs"
           - name: os-eap-python
             version: '3.6'
-          - name: jboss.container.java.rm-openjdk
           - name: jboss.container.openjdk.jdk
             version: "openj9-11"
+          - name: jboss.container.prometheus
+            version: "7"
+          - name: jboss.container.jolokia
+            version: "7"
+          - name: jboss.container.maven
+            version: "8.0.3.5"
+          - name: jboss.container.java.s2i.bash
+          - name: jboss.container.java.singleton-jdk
 
 packages:
   manager: dnf
@@ -30,12 +37,7 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
-        inherit: true
   repository:
     name: containers/jboss-eap-74-beta-openj9-11-builder
     branch: jb-eap-7.4-rhel-8

diff --git a/runtime-image/j9-11-overrides.yaml b/runtime-image/j9-11-overrides.yaml
@@ -11,9 +11,16 @@ modules:
       install:
           - name: os-eap-python
             version: '3.6'
-          - name: jboss.container.java.rm-openjdk
           - name: jboss.container.openjdk.jdk
             version: "openj9-11"
+          - name: jboss.container.prometheus
+            version: "7"
+          - name: jboss.container.jolokia
+            version: "7"
+          - name: jboss.container.maven
+            version: "8.0.3.5"
+          - name: jboss.container.java.s2i.bash
+          - name: jboss.container.java.singleton-jdk
 
 packages:
       content_sets_file: content_sets_rhel8.yml
@@ -30,12 +37,7 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
-        inherit: true
   repository:
     name: containers/jboss-eap-74-beta-openj9-11-runtime
     branch: jb-eap-7.4-rhel-8