[ARVADOS-DEV] updated: 555b039609a3c8700c27767c255fdfe00eb42063
Git user
git at public.curoverse.com
Fri Mar 11 14:18:06 EST 2016
Summary of changes:
.../package-build-dockerfiles/centos6/Dockerfile | 2 +-
.../ubuntu1204/Dockerfile | 2 +-
jenkins/run-build-packages-one-target.sh | 45 +++++++++---
jenkins/run-build-packages.sh | 85 +++++++++++++++++++++-
jenkins/run-library.sh | 33 ++++++++-
jenkins/run-tests.sh | 9 +++
6 files changed, 160 insertions(+), 16 deletions(-)
via 555b039609a3c8700c27767c255fdfe00eb42063 (commit)
via 097e2b21b9285c9cd302061552e1d343bd8debe7 (commit)
via 5d377ee0cb917903590787a770c72846dd0b10cb (commit)
via 2b9b7518a60a71315a1504bf96b3182122bec702 (commit)
via 8eda2e72fc37cdb9f947c19ad994ac094aa0a507 (commit)
via 1659fd3eca62ac51e7628af3464dd03787e2d84f (commit)
via 27ac5631c777fefc89839089109d0b06d596019d (commit)
via a4f8a4e24e7a778194878c200391c4a3dca55961 (commit)
via cdbcd6d4e3af4d99aeec97263ad12774e1ef81e4 (commit)
via 659d7361e7a0fc1f6537e6851ffd3d29ce19bb26 (commit)
via d64b434147ba00224c937d192573a46d4543089d (commit)
via d7bda40439a964ab2117933aba3694cb635e23dc (commit)
via 07c05348740cd932e54aecfa52bf2a1260b3948e (commit)
via 4640c72bbd678b70827a6d3ecaf13a8e502dfd2a (commit)
via 8600760481ba1724cc18bd9b8be7b99bbca29dea (commit)
via b7e4507cfe19368f0f80dddfde111f2dd0a690fb (commit)
via abb1db4b4dcb4931c7fa2c03e21b994ddd911a3c (commit)
via 99e1256022759020b0bba971ea5c4e252dab4611 (commit)
via f46095f12c8470a4eac64997bef622e5f26cafb9 (commit)
via 11280265c0ce229e5bd617583a06e630901a8617 (commit)
from ea62edd0b615e16b8f21fc5ba024a63dac7045c0 (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 555b039609a3c8700c27767c255fdfe00eb42063
Merge: ea62edd 097e2b2
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Mar 11 13:35:13 2016 -0500
Merge branch '8345-llfuse-unpin' refs #8345
commit 097e2b21b9285c9cd302061552e1d343bd8debe7
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Mar 11 12:28:53 2016 -0500
8345: Need "yum install -y" to reliably install rpm packages.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 0ada192..061bc99 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -363,7 +363,7 @@ elif [[ $TARGET =~ centos6 ]]; then
fpm_build "$LIBFUSE_DIR/fuse-libs-2.9.2-6.el6.x86_64.rpm" fuse-libs "Centos Developers" rpm "2.9.2" --iteration 5
fpm_build "$LIBFUSE_DIR/fuse-2.9.2-6.el6.x86_64.rpm" fuse "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
fpm_build "$LIBFUSE_DIR/fuse-devel-2.9.2-6.el6.x86_64.rpm" fuse-devel "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
- yum install \
+ yum install -y \
"$WORKSPACE/packages/$TARGET/fuse-libs-2.9.2-5.x86_64.rpm" \
"$WORKSPACE/packages/$TARGET/fuse-2.9.2-5.x86_64.rpm" \
"$WORKSPACE/packages/$TARGET/fuse-devel-2.9.2-5.x86_64.rpm"
commit 5d377ee0cb917903590787a770c72846dd0b10cb
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Mar 11 02:15:10 2016 -0500
8345: 8491: Downgrade to llfuse 0.41 until #8345 gets sorted out (but keep the fuse backports).
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 136b73c..0ada192 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -92,7 +92,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
'pycurl<7.21.5' contextlib2)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -105,7 +105,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -118,7 +118,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
contextlib2 \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
@@ -129,7 +129,7 @@ case "$TARGET" in
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse ciso8601 \
+ PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
rsa 'pycurl<7.21.5' backports.ssl_match_hostname)
PYTHON3_BACKPORTS=(docker-py requests websocket-client)
@@ -144,7 +144,7 @@ case "$TARGET" in
oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
- python-daemon lockfile llfuse 'pbr<1.0')
+ python-daemon lockfile llfuse==0.41.1 'pbr<1.0')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
export PYCURL_SSL_LIBRARY=nss
;;
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index a17d610..07a4bf4 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -425,10 +425,13 @@ pip freeze 2>/dev/null | egrep ^apache-libcloud==$LIBCLOUD_PIN \
|| pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-$LIBCLOUD_PIN.zip >/dev/null \
|| fatal "pip install apache-libcloud failed"
-# Uninstall old llfuse, because services/fuse "pip install" won't
-# upgrade it by default.
-if pip freeze | egrep '^llfuse==0\.41\.'; then
- yes | pip uninstall 'llfuse<0.42'
+# This will help people who reuse --temp dirs when we upgrade to llfuse 0.42
+if egrep -q 'llfuse.*>= *0\.42' "$WORKSPACE/services/fuse/setup.py"; then
+ # Uninstall old llfuse, because services/fuse "pip install" won't
+ # upgrade it by default.
+ if pip freeze | egrep '^llfuse==0\.41\.'; then
+ yes | pip uninstall 'llfuse<0.42'
+ fi
fi
# Deactivate Python 2 virtualenv
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list