Update 6.4 build for new repo configs and increase the timeout needed…

… to clean up after patching (#49)

container.yaml

@@ -0,0 +1,6 @@
+compose:
+  pulp_repos: true
+platforms:
+  only:
+  - x86_64
+

content_sets.yml

@@ -0,0 +1,5 @@
+ppc64le:
+- rhel-7-server-for-power-le-rhscl-rpms
+- rhel-7-for-power-le-rpms
+x86_64:
+- rhel-7-server-rpms

image.yaml

@@ -7,10 +7,10 @@ from: "rhel7:7-released"
 labels:
     - name: "com.redhat.component"
       value: "jboss-eap-6-eap64-container"
+
 packages:
-      repositories:
-          - name: base
-            id: rhel-7-server-rpms
+      content_sets_file: content_sets.yml
+
 modules:
       repositories:
           - name: cct_module
@@ -23,6 +23,8 @@ modules:
             version: "8"
           - name: eap-6.4-latest
 osbs:
+      configuration:
+            container_file: container.yaml
       repository:
             name: containers/jboss-eap-6
             branch: jb-eap-6.4-rhel-7

modules/eap/install-cleanup/install.sh

@@ -39,8 +39,8 @@ function aggregate_patched_modules {
     sleep 5
   done
 
-  timeout 30 $JBOSS_HOME/bin/jboss-cli.sh --connect --command="/core-service=patching:ageout-history"
-  timeout 30 $JBOSS_HOME/bin/jboss-cli.sh --connect --command="shutdown"
+  timeout 180 $JBOSS_HOME/bin/jboss-cli.sh --connect --command="/core-service=patching:ageout-history"
+  timeout 180 $JBOSS_HOME/bin/jboss-cli.sh --connect --command="shutdown"
 
   # give it a moment to settle
   for i in $(seq 1 10); do