[ARVADOS-DEV] updated: d44585be5835346f21df58aae29fd0c9a3f3d63e

[git at public.curoverse.com]

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

       via  d44585be5835346f21df58aae29fd0c9a3f3d63e (commit)
      from  310b52541abd4625151df391e1194ec2e7c76448 (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 d44585be5835346f21df58aae29fd0c9a3f3d63e
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Jul 27 10:50:32 2015 -0400

    Rebuild Python packages before building their distro packages.
    
    Without this, built scripts lay around between builds, with shebang
    lines for the first distro they were built for.  This can lead to
    problems like Debian packages getting shebang lines for Red Hat
    systems.  See, e.g.,
    <https://ci.curoverse.com/job/deploy-to-staging/1250/console>.
    No issue #.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 4150a2b..1ceecee 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -555,20 +555,24 @@ fpm_build $GOPATH/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curoverse, Inc.
 # whip up a patch and send it upstream, but that will be for another day. Ward,
 # 2014-05-15
 cd $WORKSPACE/packages/$TARGET
+rm -rf "$WORKSPACE/sdk/python/build"
 fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --deb-recommends=git
 
 # The FUSE driver
 # Please see comment about --no-python-fix-name above; we stay consistent and do
 # not omit the python- prefix first.
 cd $WORKSPACE/packages/$TARGET
+rm -rf "$WORKSPACE/services/fuse/build"
 fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver"
 
 # The node manager
 cd $WORKSPACE/packages/$TARGET
+rm -rf "$WORKSPACE/services/nodemanager/build"
 fpm_build $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager"
 
 # The Docker image cleaner
 cd $WORKSPACE/packages/$TARGET
+rm -rf "$WORKSPACE/services/dockercleaner/build"
 fpm_build $WORKSPACE/services/dockercleaner arvados-docker-cleaner 'Curoverse, Inc.' 'python3' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/dockercleaner/arvados_docker_cleaner.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Docker image cleaner"
 
 # A few dependencies

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


hooks/post-receive
--