[ARVADOS-DEV] updated: 7c7c2f10db25a1af16a523677444c802c66c807b
git at public.curoverse.com
git at public.curoverse.com
Thu Dec 24 14:59:25 EST 2015
Summary of changes:
arvbox/arvbox | 1 +
arvbox/docker/common.sh | 25 +++++++++++++++++++++++--
arvbox/docker/service/ready/run | 8 ++++++++
arvbox/docker/service/sdk/run | 11 +++++++----
arvbox/docker/service/workbench/run | 6 +++---
jenkins/run-tests.sh | 1 -
6 files changed, 42 insertions(+), 10 deletions(-)
via 7c7c2f10db25a1af16a523677444c802c66c807b (commit)
via e2bffcc799a671160c682131799c5b15e0a154d8 (commit)
via 2bcee7c582ec07011c4e097703d4d56358ce15de (commit)
via 46dca4e67a3068571e8787fd43bde3520cf8c71b (commit)
from e5a6bdc1950973910e748f2ccc655741d3a73604 (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 7c7c2f10db25a1af16a523677444c802c66c807b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Dec 24 14:59:11 2015 -0500
8080: Don't do "bundle package" (breaks arvbox gem sharing).
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index a7b5fda..e50d485 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -589,7 +589,6 @@ bundle_install_trylocal() {
echo "(Running bundle install again, without --local.)"
bundle install --no-deployment
fi
- bundle package --all
)
}
commit e2bffcc799a671160c682131799c5b15e0a154d8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Dec 23 17:59:03 2015 -0500
Adjust workbench secret token path.
diff --git a/arvbox/docker/service/workbench/run b/arvbox/docker/service/workbench/run
index a08136c..ea7d242 100755
--- a/arvbox/docker/service/workbench/run
+++ b/arvbox/docker/service/workbench/run
@@ -11,10 +11,10 @@ export GEM_HOME=/var/lib/arvados/gems
run_bundler --without=development
-if ! test -s secret_token ; then
- ruby -e 'puts rand(2**400).to_s(36)' > secret_token
+if ! test -s /var/lib/arvados/workbench_secret_token ; then
+ ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/workbench_secret_token
fi
-secret_token=$(cat secret_token)
+secret_token=$(cat /var/lib/arvados/workbench_secret_token)
if ! test -s self-signed.key ; then
openssl req -new -x509 -nodes -out self-signed.pem -keyout self-signed.key -days 365 -subj '/CN=localhost'
commit 2bcee7c582ec07011c4e097703d4d56358ce15de
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Dec 23 17:56:04 2015 -0500
8080: Set GEM_HOME as well as GEMHOME.
diff --git a/arvbox/arvbox b/arvbox/arvbox
index 22973ac..931a248 100755
--- a/arvbox/arvbox
+++ b/arvbox/arvbox
@@ -152,6 +152,7 @@ case $1 in
VENV3DIR=/var/lib/arvados/tests-venv3 \
GOPATH=/var/lib/arvados/tests-gostuff \
GEMHOME=/var/lib/arvados/gems \
+ GEM_HOME=/var/lib/arvados/gems \
"$@"
docker stop $ARVBOX_CONTAINER
docker rm $ARVBOX_CONTAINER
commit 46dca4e67a3068571e8787fd43bde3520cf8c71b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Dec 23 17:33:52 2015 -0500
Use locally cached gems and python packages.
diff --git a/arvbox/docker/common.sh b/arvbox/docker/common.sh
index 20d164c..37bbf8e 100644
--- a/arvbox/docker/common.sh
+++ b/arvbox/docker/common.sh
@@ -1,8 +1,29 @@
localip=$(ip addr show eth0 |grep "inet " | sed 's/ *inet \([^/]*\).*/\1/')
export GEM_HOME=/var/lib/arvados/gems
+export GEM_PATH=/var/lib/arvados/gems
run_bundler() {
- if ! flock /var/lib/arvados/gems.lock bundle install --local --no-deployment "$@" ; then
- flock /var/lib/arvados/gems.lock bundle install --no-deployment "$@"
+ flock /var/lib/arvados/gems.lock bundle install --local --no-deployment --frozen "$@"
+ if ! flock /var/lib/arvados/gems.lock bundle install --local --no-deployment --frozen "$@" ; then
+ flock /var/lib/arvados/gems.lock bundle install --no-deployment --frozen "$@"
+ fi
+}
+
+pip_install() {
+ pushd /var/lib/arvados/pip
+ for p in $(ls http*.tar.gz) ; do
+ if test -f $p ; then
+ ln -sf $p $(echo $p | sed 's/.*%2F\(.*\)/\1/')
+ fi
+ done
+ for p in $(ls http*.whl) ; do
+ if test -f $p ; then
+ ln -sf $p $(echo $p | sed 's/.*%2F\(.*\)/\1/')
+ fi
+ done
+ popd
+
+ if ! pip install --no-index --find-links /var/lib/arvados/pip $1 ; then
+ pip install $1
fi
}
diff --git a/arvbox/docker/service/ready/run b/arvbox/docker/service/ready/run
index 60ac664..2b117b9 100755
--- a/arvbox/docker/service/ready/run
+++ b/arvbox/docker/service/ready/run
@@ -49,6 +49,14 @@ if ! docker version >/dev/null 2>/dev/null ; then
waiting="$waiting docker"
fi
+if ! which arv >/dev/null ; then
+ waiting="$waiting ruby_sdk"
+fi
+
+if ! which arv-get >/dev/null ; then
+ waiting="$waiting python_sdk"
+fi
+
if ! [[ -z "$waiting" ]] ; then
if ps x | grep -v grep | grep "bundle install" > /dev/null; then
waiting="$waiting (installing ruby gems)"
diff --git a/arvbox/docker/service/sdk/run b/arvbox/docker/service/sdk/run
index 10df374..e5e8880 100755
--- a/arvbox/docker/service/sdk/run
+++ b/arvbox/docker/service/sdk/run
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
exec 2>&1
set -eux
+. /root/common.sh
+
mkdir -p ~/.pip /var/lib/arvados/pip
cat > ~/.pip/pip.conf <<EOF
[global]
@@ -10,15 +12,16 @@ download_cache = /var/lib/arvados/pip
EOF
cd /usr/src/arvados/sdk/cli
-bundle install --binstubs=binstubs
+run_bundler --binstubs=$PWD/binstubs
ln -sf /usr/src/arvados/sdk/cli/binstubs/arv /usr/bin/arv
+
cd /usr/src/arvados/sdk/python
python setup.py sdist
-pip install $(ls dist/arvados-python-client-*.tar.gz | tail -n1)
+pip_install $(ls dist/arvados-python-client-*.tar.gz | tail -n1)
cd /usr/src/arvados/services/fuse
python setup.py sdist
-pip install $(ls dist/arvados_fuse-*.tar.gz | tail -n1)
+pip_install $(ls dist/arvados_fuse-*.tar.gz | tail -n1)
sv stop sdk
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list