[ARVADOS-DEV] created: acd44436b6559002ecd179b8f7a46ad86dfdb91a

[git at public.curoverse.com]

        at  acd44436b6559002ecd179b8f7a46ad86dfdb91a (commit)


commit acd44436b6559002ecd179b8f7a46ad86dfdb91a
Author: Nico Cesar <nico at curoverse.com>
Date:   Fri Oct 2 11:14:23 2015 -0400

    6034: added new fpm args for keepproxy packages
    
    refs #6034

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index f813ac1..8f4f866 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -283,7 +283,7 @@ handle_python_package
     cd $WORKSPACE/packages/$TARGET
     fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--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"
 
-    rm -r "$SRC_BUILD_DIR"
+    rm -rf "$SRC_BUILD_DIR"
 )
 
 # Keep
@@ -316,7 +316,41 @@ fi
 
 go get "git.curoverse.com/arvados.git/services/keepproxy"
 cd $WORKSPACE/packages/$TARGET
-fpm_build $GOPATH/bin/keepproxy=/usr/bin/keepproxy keepproxy 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=Keepproxy makes a Keep cluster accessible to clients that are not on the LAN"
+
+
+case "$TARGET" in
+    debian7)
+	FPM_EXTRAS="\
+         --after-install $WORKSPACE/services/keepproxy/pkg-extras/after-install-$TARGET \
+         $WORKSPACE/services/keepproxy/pkg-extras/etc/default/keepproxy=/etc/default/keepproxy \
+         $WORKSPACE/services/keepproxy/pkg-extras/etc/init.d/keepproxy=/etc/init.d/keepproxy \
+	 "
+        ;;
+    debian8)
+	FPM_EXTRAS=""
+        ;;
+    ubuntu1204)
+	FPM_EXTRAS=""
+        ;;
+    ubuntu1404)
+	FPM_EXTRAS=""
+        ;;
+    centos6)
+	FPM_EXTRAS=""
+        ;;
+esac
+
+fpm_build \
+    $GOPATH/bin/keepproxy=/usr/bin/keepproxy \
+    keepproxy  \
+    'Curoverse, Inc.' \
+    'dir' \
+    "$PKG_VERSION" \
+    "--url=https://arvados.org" \
+    "--license=GNU Affero General Public License, version 3.0" \
+    "--description=Keepproxy makes a Keep cluster accessible to clients that are not on the LAN" \
+    $FPM_EXTRAS \
+    $WORKSPACE/services/keepproxy/pkg-extras/examples/keepproxy-sysv-initscript=/usr/share/doc/keepproxy/keepproxy-init
 
 # datamanager
 cd "$GOPATH/src/git.curoverse.com/arvados.git/services/datamanager"

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


hooks/post-receive
--