From 85721c5bb09028974a724a43849f7291bc5f719d Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Fri, 8 Dec 2017 07:29:43 -0700
Subject: debug support integrated into jenkins

Issue: IS-44
---
 salt/openbook/ci/files/openbook.gentoo |  8 +++++++-
 salt/openbook/ci/files/openbook.redhat |  3 +++
 salt/openbook/ci/files/openbook.ubuntu |  3 +++
 salt/openbook/ci/files/openbookctl     | 20 +++++++++++++-------
 4 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'salt/openbook/ci/files')

diff --git a/salt/openbook/ci/files/openbook.gentoo b/salt/openbook/ci/files/openbook.gentoo
index 4a639d4..62dd27a 100644
--- a/salt/openbook/ci/files/openbook.gentoo
+++ b/salt/openbook/ci/files/openbook.gentoo
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
 
-extra_commands=test_database
+extra_commands="debug test_database"
 
 depend() {
     need docker
@@ -12,6 +12,12 @@ start() {
     eend $?
 }
 
+debug() {
+    ebegin "Starting Openbook in debug mode"
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+    eend $?
+}
+
 stop() {
     ebegin "Stopping Openbook"
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
diff --git a/salt/openbook/ci/files/openbook.redhat b/salt/openbook/ci/files/openbook.redhat
index 571894a..5f3f934 100644
--- a/salt/openbook/ci/files/openbook.redhat
+++ b/salt/openbook/ci/files/openbook.redhat
@@ -17,6 +17,9 @@ case $1 in
     start*)
         {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
         ;;
+    debug*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+        ;;
     stop*)
         {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
         ;;
diff --git a/salt/openbook/ci/files/openbook.ubuntu b/salt/openbook/ci/files/openbook.ubuntu
index cda042d..6c50c76 100644
--- a/salt/openbook/ci/files/openbook.ubuntu
+++ b/salt/openbook/ci/files/openbook.ubuntu
@@ -13,6 +13,9 @@ case $1 in
     start*)
         {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
         ;;
+    debug*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+        ;;
     stop*)
         {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
         ;;
diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl
index 57aefb4..6a8aa5e 100644
--- a/salt/openbook/ci/files/openbookctl
+++ b/salt/openbook/ci/files/openbookctl
@@ -38,25 +38,25 @@ do_start() {
     ensure_openbook_databases_created
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_job_scheduler_server|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/job_scheduler_server/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/job_scheduler_server/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_workflow_server|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/workflow_server/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/workflow_server/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_admin_api_server|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_api_server/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_api_server/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_customer_api_server|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_api_server/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_api_server/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_admin_web_ui|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_web_ui/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_web_ui/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_customer_web_ui|string() %}{% endraw %}
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_web_ui/run.sh
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_web_ui/run.sh ${@}
 {% raw %}{% endif %}{% endraw %}
     echo
-    echo "Openbook started. All components may not be fully initialized and available."
+    echo "Openbook started."
 }
 
 do_stop() {
@@ -82,11 +82,14 @@ do_stop() {
     docker stop {{ pillar["database"]["container_name"] }}
 {% raw %}{% endif %}{% endraw %}
     docker container prune -f
+    echo
+    echo "Openbook stopped."
 }
 
 do_help() {
     echo "Usage:"
     echo "    $0 start"
+    echo "    $0 debug"
     echo "    $0 stop"
 {% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %}
     echo "    $0 test_database"
@@ -97,6 +100,9 @@ case $1 in
     start*)
         do_start
         ;;
+    debug*)
+        do_start debug
+        ;;
     stop*)
         do_stop
         ;;
-- 
cgit v1.3