[ARVADOS-DEV] updated: a013dc7e4f0d91499d7349eee553a771551cd13e

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

       via  a013dc7e4f0d91499d7349eee553a771551cd13e (commit)
       via  1a655bf26c6bbec82c13d79e15f9fdd43fb18c1d (commit)
      from  8f4aa687e70abdd7329a2ebf928a175eb529744b (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 a013dc7e4f0d91499d7349eee553a771551cd13e
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Oct 21 09:00:59 2014 -0400

    * exclude /usr/local/lib/python2.7/dist-packages/tests from our fpm packages
    
    * exclude /usr/local/arvados/src/.git from the arvados-src package (bugfix)
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index edefe88..3a8f9c9 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -125,7 +125,7 @@ build_and_scp_deb () {
     PACKAGE_TYPE='python'
   fi
 
-  declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "deb")
+  declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "deb" "-x" "usr/local/lib/python2.7/dist-packages/tests")
 
   if [[ "$PACKAGE_NAME" != "$PACKAGE" ]]; then
     COMMAND_ARR+=('-n' "$PACKAGE_NAME")
@@ -291,7 +291,7 @@ fi
 
 # Build arvados src deb package
 cd $WORKSPACE/debs
-build_and_scp_deb $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "0.1.$GIT_HASH" "-x 'usr/local/arvados/src/.git*'" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
+build_and_scp_deb $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "0.1.$GIT_HASH" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
 
 # clean up, check out master and step away from detached-head state
 cd "$WORKSPACE/src-build-dir"

commit 1a655bf26c6bbec82c13d79e15f9fdd43fb18c1d
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Oct 21 08:39:06 2014 -0400

    run-build-packages: Test that fpm is callable before trying to do
    anything.
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index aed423d..edefe88 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -70,6 +70,17 @@ if ! [[ -n "$WORKSPACE" ]]; then
   exit 1
 fi
 
+# Test for fpm
+fpm --version >/dev/null 2>&1
+
+if [[ "$?" != 0 ]]; then
+  echo >&2 "$helpmessage"
+  echo >&2
+  echo >&2 "Error: fpm not found"
+  echo >&2
+  exit 1
+fi
+
 if [[ "$DEBUG" != 0 ]]; then
   echo "Workspace is $WORKSPACE"
 fi

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


hooks/post-receive
--