From d5382d48a2aaa6d2207215729cda9ed27cc260b1 Mon Sep 17 00:00:00 2001
From: Ken Wills <ken@zaptillion.net>
Date: Wed, 16 Jan 2019 13:45:22 -0600
Subject: [PATCH] Update 6.4 build for new repo configs and increase the
 timeout needed to clean up after patching (#49)

---
 container.yaml                         | 6 ++++++
 content_sets.yml                       | 5 +++++
 image.yaml                             | 8 +++++---
 modules/eap/install-cleanup/install.sh | 4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 container.yaml
 create mode 100644 content_sets.yml

diff --git a/container.yaml b/container.yaml
new file mode 100644
index 0000000..0fa109f
--- /dev/null
+++ b/container.yaml
@@ -0,0 +1,6 @@
+compose:
+  pulp_repos: true
+platforms:
+  only:
+  - x86_64
+
diff --git a/content_sets.yml b/content_sets.yml
new file mode 100644
index 0000000..05e4fb7
--- /dev/null
+++ b/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
diff --git a/image.yaml b/image.yaml
index 5c9727e..4faa429 100644
--- a/image.yaml
+++ b/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
diff --git a/modules/eap/install-cleanup/install.sh b/modules/eap/install-cleanup/install.sh
index f90aae0..d924ccf 100755
--- a/modules/eap/install-cleanup/install.sh
+++ b/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