[ARVADOS-DEV] updated: ff110d616ea28bffb9677f91702f716992e7d130

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-library.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

       via  ff110d616ea28bffb9677f91702f716992e7d130 (commit)
      from  680bebbec151616f1582e6c1e85b7515907670f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ff110d616ea28bffb9677f91702f716992e7d130
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Jan 22 17:44:55 2016 -0500

    Make sure not to accidentally include config/application.yml and
    config/database.yml in our rails packages, take 2: make sure that
    config/database.yml *is* present in our workbench packages, where we
    want to include it.
    
    No issue #

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index aed260e..7666837 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -157,10 +157,13 @@ handle_rails_package() {
     local exclude_root="${railsdir#/}"
     # .git and packages are for the SSO server, which is built from its
     # repository root.
-    for exclude in .git packages tmp log coverage \
-                        Capfile\* config/deploy\* \
-                        config/application.yml \
-                        config/database.yml; do
+    local -a exclude_list=(.git packages tmp log coverage Capfile\* \
+                           config/deploy\* config/application.yml)
+    # for arvados-workbench, we need to have the (dummy) config/database.yml in the package
+    if  [[ "$pkgname" != "arvados-workbench" ]]; then
+      exclude_list+=('config/database.yml')
+    fi
+    for exclude in ${exclude_list[@]}; do
         switches+=(-x "$exclude_root/$exclude")
     done
     fpm_build "${pos_args[@]}" "${switches[@]}" \

-----------------------------------------------------------------------


hooks/post-receive
--