[ARVADOS-DEV] created: 96952e4e39a617dd5233772ccf31c42195150d5e
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 4 10:31:09 EDT 2015
at 96952e4e39a617dd5233772ccf31c42195150d5e (commit)
commit 96952e4e39a617dd5233772ccf31c42195150d5e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Sep 4 10:00:23 2015 -0400
Bump version to dev2
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 00e1541..15bdc5b 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -394,7 +394,7 @@ LIBCLOUD_DIR=$(mktemp -d)
(
cd $LIBCLOUD_DIR
git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
- git checkout apache-libcloud-0.18.1.dev1
+ git checkout apache-libcloud-0.18.1.dev2
handle_python_package
)
fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index e2ae4c5..87c83e1 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -414,8 +414,8 @@ pip freeze 2>/dev/null | egrep ^PyYAML= \
# Preinstall forked version of libcloud, because nodemanager "pip install"
# won't pick it up by default.
-pip freeze 2>/dev/null | egrep ^apache-libcloud==0.18.1.dev1 \
- || pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev1.zip >/dev/null \
+pip freeze 2>/dev/null | egrep ^apache-libcloud==0.18.1.dev2 \
+ || pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev2.zip >/dev/null \
|| fatal "pip install apache-libcloud failed"
# If Python 3 is available, set up its virtualenv in $VENV3DIR.
commit 9201f7f9da3043ad5574d3cfb8f841493a76460e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Aug 31 14:10:53 2015 -0400
7031: Fix python prefix
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index fcebf6c..00e1541 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -397,7 +397,7 @@ LIBCLOUD_DIR=$(mktemp -d)
git checkout apache-libcloud-0.18.1.dev1
handle_python_package
)
-fpm_build $LIBCLOUD_DIR python-apache-libcloud
+fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud
rm -rf $LIBCLOUD_DIR
# A few dependencies
commit 9dda02a389dd2989e6190e07d2d5e8727dd6842a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Aug 31 13:38:37 2015 -0400
7031: Check out our forked libcloud from git and make packages from that.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 31734a9..fcebf6c 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -95,7 +95,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
- virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+ virtualenv pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -108,7 +108,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
- virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+ virtualenv pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -121,7 +121,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
- virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+ virtualenv pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -133,7 +133,7 @@ case "$TARGET" in
PYTHON3_PKG_PREFIX=python3
PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse ciso8601 \
google-api-python-client six uritemplate oauth2client httplib2 \
- rsa apache-libcloud pycurl backports.ssl_match_hostname)
+ rsa pycurl backports.ssl_match_hostname)
PYTHON3_BACKPORTS=(docker-py requests websocket-client)
;;
centos6)
@@ -145,7 +145,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
- pykka apache-libcloud requests six pyexecjs jsonschema \
+ pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl
python-daemon lockfile llfuse)
PYTHON3_BACKPORTS=(docker-py six requests)
@@ -389,6 +389,17 @@ cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/dockercleaner/build"
fpm_build $WORKSPACE/services/dockercleaner arvados-docker-cleaner 'Curoverse, Inc.' 'python3' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/dockercleaner/arvados_docker_cleaner.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Docker image cleaner"
+# Forked libcloud
+LIBCLOUD_DIR=$(mktemp -d)
+(
+ cd $LIBCLOUD_DIR
+ git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
+ git checkout apache-libcloud-0.18.1.dev1
+ handle_python_package
+)
+fpm_build $LIBCLOUD_DIR python-apache-libcloud
+rm -rf $LIBCLOUD_DIR
+
# A few dependencies
for deppkg in "${PYTHON_BACKPORTS[@]}"; do
outname=$(echo "$deppkg" | sed -e 's/^python-//' -e 's/[<=>].*//' -e 's/_/-/g' -e "s/^/${PYTHON2_PKG_PREFIX}-/")
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list