From: Tom Clegg <tom@curoverse.com>
Date: Wed, 4 Nov 2015 04:50:44 +0000 (-0500)
Subject: 5824: Add services/keep-web
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/57b2c57db16bed3f712200f603a9e77998706cc6

5824: Add services/keep-web
---

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index a767b29..d122336 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -320,6 +320,21 @@ 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"
 
+# keep-web
+cd "$GOPATH/src/git.curoverse.com/arvados.git/services/keep-web"
+KEEP_WEB_VERSION=$(version_from_git)
+KEEP_WEB_TIMESTAMP=$(timestamp_from_git)
+
+if [[ "$GO_SDK_TIMESTAMP" -gt "$KEEP_WEB_TIMESTAMP" ]]; then
+  PKG_VERSION=$GO_SDK_VERSION
+else
+  PKG_VERSION=$KEEP_WEB_VERSION
+fi
+
+go get "git.curoverse.com/arvados.git/services/keep-web"
+cd $WORKSPACE/packages/$TARGET
+fpm_build $GOPATH/bin/keep-web=/usr/bin/keep-web keep-web 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=Static web hosting service for user data stored in Arvados Keep"
+
 # datamanager
 cd "$GOPATH/src/git.curoverse.com/arvados.git/services/datamanager"
 DATAMANAGER_VERSION=$(version_from_git)
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 93cf966..8e845cb 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -59,14 +59,15 @@ apps/workbench_benchmark
 apps/workbench_profile
 doc
 services/api
+services/arv-git-httpd
 services/crunchstat
 services/dockercleaner
 services/fuse
+services/keep-web
 services/keepproxy
 services/keepstore
 services/login-sync
 services/nodemanager
-services/arv-git-httpd
 sdk/cli
 sdk/pam
 sdk/python
@@ -699,6 +700,7 @@ gostuff=(
     sdk/go/streamer
     services/arv-git-httpd
     services/crunchstat
+    services/keep-web
     services/keepstore
     sdk/go/keepclient
     services/keepproxy