[ARVADOS-DEV] created: c6de6999ba87c75f2856953b908ddec4af404c99
git at public.curoverse.com
git at public.curoverse.com
Thu Jun 25 15:22:18 EDT 2015
at c6de6999ba87c75f2856953b908ddec4af404c99 (commit)
commit c6de6999ba87c75f2856953b908ddec4af404c99
Author: Brett Smith <brett at curoverse.com>
Date: Thu Jun 25 15:22:14 2015 -0400
6388: Improve portability of Python backports in run-build-packages.
* Prefix package names with the same prefix used by the interpreter
package, to avoid conflicts with system packages when we're using
something like Software Collections.
* Always specify a dependency on that package.
* Exclude more test paths from packages to avoid conflicts.
* Do a little name munging to make sure that output package names
match dependencies generated by fpm.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 0b3fe75..6ebef74 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -98,7 +98,9 @@ case "$TARGET" in
REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rm -f *deb'
PYTHON2_PACKAGE=python$PYTHON2_VERSION
+ PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
+ PYTHON3_PKG_PREFIX=python3
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
@@ -112,7 +114,9 @@ case "$TARGET" in
REPO_UPDATE_CMD='mv *rpm /var/www/rpm.arvados.org/CentOS/6/os/x86_64/ && createrepo /var/www/rpm.arvados.org/CentOS/6/os/x86_64/'
PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
+ PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE
PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
+ PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
@@ -243,7 +247,9 @@ fpm_build_and_scp () {
# All Arvados Python2 packages depend on Python 2.7.
# Make sure we build with that for consistency.
set -- "$@" --python-bin python2.7 \
- --python-easyinstall "$EASY_INSTALL2"
+ --python-easyinstall "$EASY_INSTALL2" \
+ --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
+ --depends "$PYTHON2_PACKAGE"
;;
python3)
# fpm does not actually support a python3 package type. Instead
@@ -253,11 +259,15 @@ fpm_build_and_scp () {
PACKAGE_TYPE=python
set -- "$@" --python-bin python3 \
--python-easyinstall "$EASY_INSTALL3" \
- --python-package-name-prefix python3 --depends "$PYTHON3_PACKAGE"
+ --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
+ --depends "$PYTHON3_PACKAGE"
;;
esac
- declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "$FORMAT" "-x" "usr/local/lib/python2.7/dist-packages/tests")
+ declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "$FORMAT")
+ if [ python = "$PACKAGE_TYPE" ]; then
+ COMMAND_ARR+=(--exclude=\*/{dist,site}-packages/tests/\*)
+ fi
if [[ "$PACKAGE_NAME" != "$PACKAGE" ]]; then
COMMAND_ARR+=('-n' "$PACKAGE_NAME")
@@ -581,17 +591,17 @@ fpm_build_and_scp $GOPATH/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curover
# whip up a patch and send it upstream, but that will be for another day. Ward,
# 2014-05-15
cd $WORKSPACE/debs
-fpm_build_and_scp $WORKSPACE/sdk/python python-arvados-python-client 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --depends="$PYTHON2_PACKAGE"
+fpm_build_and_scp $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK"
# The FUSE driver
# Please see comment about --no-python-fix-name above; we stay consistent and do
# not omit the python- prefix first.
cd $WORKSPACE/debs
-fpm_build_and_scp $WORKSPACE/services/fuse python-arvados-fuse 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver" --depends="$PYTHON2_PACKAGE"
+fpm_build_and_scp $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver"
# The node manager
cd $WORKSPACE/debs
-fpm_build_and_scp $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager" --depends="$PYTHON2_PACKAGE"
+fpm_build_and_scp $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager"
# The Docker image cleaner
cd $WORKSPACE/debs
@@ -599,13 +609,15 @@ fpm_build_and_scp $WORKSPACE/services/dockercleaner arvados-docker-cleaner 'Curo
# A few dependencies
for deppkg in "${PYTHON_BACKPORTS[@]}"; do
- fpm_build_and_scp "$deppkg"
+ outname=$(echo "$deppkg" | sed -e 's/^python-//' -e 's/[<=>].*//' -e 's/_/-/g' -e "s/^/${PYTHON2_PKG_PREFIX}-/")
+ fpm_build_and_scp "$deppkg" "$outname"
done
# Python 3 dependencies
for deppkg in "${PYTHON3_BACKPORTS[@]}"; do
+ outname=$(echo "$deppkg" | sed -e 's/^python-//' -e 's/[<=>].*//' -e 's/_/-/g' -e "s/^/${PYTHON3_PKG_PREFIX}-/")
# The empty string is the vendor argument: these aren't Curoverse software.
- fpm_build_and_scp "$deppkg" "python3-$deppkg" "" python3
+ fpm_build_and_scp "$deppkg" "$outname" "" python3
done
# Build the API server package
commit f4fcedfae4edf9c38cf9becb228f3956f2812448
Author: Brett Smith <brett at curoverse.com>
Date: Thu Jun 25 15:19:22 2015 -0400
6388: CentOS 6 needs Python daemon and llfuse backported.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 644ebd4..0b3fe75 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -117,7 +117,8 @@ case "$TARGET" in
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
pykka apache-libcloud requests six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname pycurl)
+ ciso8601 pycrypto backports.ssl_match_hostname pycurl
+ daemon llfuse)
PYTHON3_BACKPORTS=(docker-py six requests)
export PYCURL_SSL_LIBRARY=nss
;;
commit 0b1b571382be1fbbfb4b2dbb499f0367a798e711
Author: Brett Smith <brett at curoverse.com>
Date: Thu Jun 25 15:18:58 2015 -0400
6388: Build specific backport versions for Python OAuth dependencies.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index b3b58e4..644ebd4 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -100,7 +100,8 @@ case "$TARGET" in
PYTHON2_PACKAGE=python$PYTHON2_VERSION
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1 pyasn1-modules rsa uritemplate httplib2 ws4py \
+ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ rsa uritemplate httplib2 ws4py \
virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl)
PYTHON3_BACKPORTS=(docker-py six requests)
@@ -113,8 +114,9 @@ case "$TARGET" in
PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1 pyasn1-modules rsa uritemplate httplib2 ws4py \
- virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ rsa uritemplate httplib2 ws4py \
+ pykka apache-libcloud requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl)
PYTHON3_BACKPORTS=(docker-py six requests)
export PYCURL_SSL_LIBRARY=nss
commit 0181b121e163c32c932aa4585ae668d50584281f
Author: Brett Smith <brett at curoverse.com>
Date: Thu Jun 25 15:16:57 2015 -0400
6388: Build PyCURL with NSS on CentOS 6.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 7f4dd29..b3b58e4 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -117,6 +117,7 @@ case "$TARGET" in
virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl)
PYTHON3_BACKPORTS=(docker-py six requests)
+ export PYCURL_SSL_LIBRARY=nss
;;
*)
echo -e "$0: Unknown target '$TARGET'.\n" >&2
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list