[ARVADOS-DEV] updated: 659d7361e7a0fc1f6537e6851ffd3d29ce19bb26

[Git user]

Summary of changes:
 arvbox/bin/arvbox                                  |  7 +++--
 arvbox/lib/arvbox/docker/Dockerfile.base           |  5 +---
 arvbox/lib/arvbox/docker/Dockerfile.demo           |  3 +++
 arvbox/lib/arvbox/docker/Dockerfile.dev            |  3 +++
 .../{workbench => slurmctld}/log/main/.gitstub     |  0
 .../service/{workbench => slurmctld}/log/run       |  0
 arvbox/lib/arvbox/docker/service/slurmctld/run     | 31 ++++++++++++++++++++++
 .../{workbench => slurmd}/log/main/.gitstub        |  0
 .../docker/service/{workbench => slurmd}/log/run   |  0
 arvbox/lib/arvbox/docker/service/slurmd/run        |  6 +++++
 arvbox/lib/arvbox/docker/service/vm/run            | 14 +++++++++-
 arvbox/lib/arvbox/docker/service/vm/run-service    |  5 ----
 jenkins/rails-package-scripts/postinst.sh          |  8 +++---
 jenkins/rails-package-scripts/postrm.sh            |  2 +-
 jenkins/run-build-packages-one-target.sh           | 31 +++++++++++++++++-----
 jenkins/run-library.sh                             |  5 ++--
 16 files changed, 92 insertions(+), 28 deletions(-)
 copy arvbox/lib/arvbox/docker/service/{workbench => slurmctld}/log/main/.gitstub (100%)
 copy arvbox/lib/arvbox/docker/service/{workbench => slurmctld}/log/run (100%)
 create mode 100755 arvbox/lib/arvbox/docker/service/slurmctld/run
 copy arvbox/lib/arvbox/docker/service/{workbench => slurmd}/log/main/.gitstub (100%)
 copy arvbox/lib/arvbox/docker/service/{workbench => slurmd}/log/run (100%)
 create mode 100755 arvbox/lib/arvbox/docker/service/slurmd/run

       via  659d7361e7a0fc1f6537e6851ffd3d29ce19bb26 (commit)
       via  d64b434147ba00224c937d192573a46d4543089d (commit)
       via  623af8e46e921f59abeeee9e7ae8ec4aef890b5b (commit)
       via  f0a79eeed911157a9095b04e34e7da79c45d4340 (commit)
       via  8a067f3805be65efd9200a8d772cc4301707dcb0 (commit)
       via  3c7848724d18912317d3198192004cc2fceeaa3f (commit)
       via  acab2f7c338f245baa7e5d9dca57476d12d863bf (commit)
       via  ec60d7fd235835947efd8dba97213015d37b036a (commit)
       via  f03b4165fd33b2f8844a4bcda7f650a7023986f1 (commit)
       via  1aa0a5407d6a4e6b861d1fcf52d8268d62b9d6d4 (commit)
       via  e7ddc93ee0608266c34efbbfd4a84464eb8e81d2 (commit)
       via  e407a1d4db57c41cebebaf8f3d663785df8f5fb4 (commit)
      from  d7bda40439a964ab2117933aba3694cb635e23dc (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 659d7361e7a0fc1f6537e6851ffd3d29ce19bb26
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 2 10:34:58 2016 -0500

    8345: Use a separate vendor/cache for each OS target. See dev.arvados.org/issues/8345#note-11

diff --git a/jenkins/run-build-packages-one-target.sh b/jenkins/run-build-packages-one-target.sh
index 9597703..34d8c08 100755
--- a/jenkins/run-build-packages-one-target.sh
+++ b/jenkins/run-build-packages-one-target.sh
@@ -150,13 +150,27 @@ FINAL_EXITCODE=0
 
 package_fails=""
 
+mkdir -p "$WORKSPACE/apps/workbench/vendor/cache-$TARGET"
+mkdir -p "$WORKSPACE/services/api/vendor/cache-$TARGET"
+
+docker_volume_args=(
+    -v "$JENKINS_DIR:/jenkins"
+    -v "$WORKSPACE:/arvados"
+    -v /arvados/services/api/vendor/bundle
+    -v /arvados/apps/workbench/vendor/bundle
+    -v "$WORKSPACE/services/api/vendor/cache-$TARGET:/arvados/services/api/vendor/cache"
+    -v "$WORKSPACE/apps/workbench/vendor/cache-$TARGET:/arvados/apps/workbench/vendor/cache"
+)
+
 if [[ -n "$test_packages" ]]; then
     for p in $packages ; do
-        if docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
-               --env ARVADOS_DEBUG=1 \
-               --env "TARGET=$TARGET" \
-               --env "WORKSPACE=/arvados" \
-               "$IMAGE" $COMMAND $p ; then
+        if docker run --rm \
+            "${docker_volume_args[@]}" \
+            --env ARVADOS_DEBUG=1 \
+            --env "TARGET=$TARGET" \
+            --env "WORKSPACE=/arvados" \
+            "$IMAGE" $COMMAND $p
+        then
             true
         else
             FINAL_EXITCODE=$?
@@ -165,8 +179,11 @@ if [[ -n "$test_packages" ]]; then
         fi
     done
 else
-    if docker run --rm -v "$JENKINS_DIR:/jenkins" -v "$WORKSPACE:/arvados" \
-           --env ARVADOS_DEBUG=1 "$IMAGE" $COMMAND ; then
+    if docker run --rm \
+        "${docker_volume_args[@]}" \
+        --env ARVADOS_DEBUG=1 \
+        "$IMAGE" $COMMAND
+    then
         echo
         echo "Build packages for $TARGET succeeded." >&2
     else

commit d64b434147ba00224c937d192573a46d4543089d
Merge: d7bda40 623af8e
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 1 02:42:46 2016 -0500

    Merge branch 'master' into 8345-llfuse-unpin


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


hooks/post-receive
--