[ARVADOS-DEV] updated: 82807388a1f7dd901e619419690253a5fd58663b
git at public.curoverse.com
git at public.curoverse.com
Wed Jun 24 17:47:51 EDT 2015
Summary of changes:
jenkins/run-build-packages.sh | 64 ++++++++++++++++++++++++++++---------------
1 file changed, 42 insertions(+), 22 deletions(-)
via 82807388a1f7dd901e619419690253a5fd58663b (commit)
via 53ad1144ce5b37d4d6e7c9cdbabddf92b483f75a (commit)
via e5561b32e943e67eb457b8d7669e005a0338395e (commit)
from 2f56fdaf3a039ee87d264933fe1306c2642f81fe (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 82807388a1f7dd901e619419690253a5fd58663b
Author: Brett Smith <brett at curoverse.com>
Date: Wed Jun 24 17:47:30 2015 -0400
6388: run-build-packages introspects more Python environment.
* Look for easy_install under a few different names.
* On CentOS, query the package that provides each Python, and list
that as a dependency.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 818a528..b54761c 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -88,11 +88,17 @@ fi
declare -a PYTHON_BACKPORTS PYTHON3_BACKPORTS
+PYTHON2_VERSION=2.7
+PYTHON3_VERSION=$(python3 -c 'import sys; print("{v.major}.{v.minor}".format(v=sys.version_info))')
+
case "$TARGET" in
debian7)
FORMAT=deb
FPM_OUTDIR=tmp
REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rm -f *deb'
+
+ 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 \
virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
@@ -103,6 +109,9 @@ case "$TARGET" in
FORMAT=rpm
FPM_OUTDIR=rpm
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')
+ 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 \
@@ -135,15 +144,24 @@ if [[ "$?" != 0 ]]; then
exit 1
fi
-if ! easy_install3 --version >/dev/null; then
- cat >&2 <<EOF
+find_easy_install() {
+ for version_suffix in "$@"; do
+ if "easy_install$version_suffix" --version >/dev/null 2>&1; then
+ echo "easy_install$version_suffix"
+ return 0
+ fi
+ done
+ cat >&2 <<EOF
$helpmessage
-Error: easy_install3 (from python3-setuptools) not found
+Error: easy_install$1 (from Python setuptools module) not found
EOF
- exit 1
-fi
+ exit 1
+}
+
+EASY_INSTALL2=$(find_easy_install -$PYTHON2_VERSION "")
+EASY_INSTALL3=$(find_easy_install -$PYTHON3_VERSION 3)
RUN_BUILD_PACKAGES_PATH="`dirname \"$0\"`"
RUN_BUILD_PACKAGES_PATH="`( cd \"$RUN_BUILD_PACKAGES_PATH\" && pwd )`" # absolutized and normalized
@@ -221,7 +239,7 @@ 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_install-2.7
+ --python-easyinstall "$EASY_INSTALL2"
;;
python3)
# fpm does not actually support a python3 package type. Instead
@@ -229,8 +247,9 @@ fpm_build_and_scp () {
# necessary arguments to fpm's command line later, after we're
# done handling positional arguments.
PACKAGE_TYPE=python
- set -- "$@" --python-bin python3 --python-easyinstall easy_install3 \
- --python-package-name-prefix python3 --depends python3
+ set -- "$@" --python-bin python3 \
+ --python-easyinstall "$EASY_INSTALL3" \
+ --python-package-name-prefix python3 --depends "$PYTHON3_PACKAGE"
;;
esac
@@ -558,17 +577,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.7
+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"
# 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.7
+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"
# 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.7
+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"
# The Docker image cleaner
cd $WORKSPACE/debs
commit 53ad1144ce5b37d4d6e7c9cdbabddf92b483f75a
Author: Brett Smith <brett at curoverse.com>
Date: Wed Jun 24 17:06:03 2015 -0400
6388: Fix Arvados Perl SDK package build.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 3d7e55d..818a528 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -319,6 +319,10 @@ if [[ "$DEBUG" != 0 ]]; then
echo "umask is" `umask`
fi
+if [[ ! -d "$WORKSPACE/debs" ]]; then
+ mkdir -p $WORKSPACE/debs
+fi
+
# Perl packages
if [[ "$DEBUG" != 0 ]]; then
echo -e "\nPerl packages\n"
@@ -335,14 +339,15 @@ cd "$WORKSPACE/sdk/perl"
if [[ -e Makefile ]]; then
make realclean >"$PERL_OUT"
fi
-find -maxdepth 1 \( -name 'MANIFEST*' -or -name 'libarvados-perl_*.deb' \) \
+find -maxdepth 1 \( -name 'MANIFEST*' -or -name "libarvados-perl*.$FORMAT" \) \
-delete
rm -rf install
-perl Makefile.PL >"$PERL_OUT" && \
- make install PREFIX=install INSTALLDIRS=perl >"$PERL_OUT" && \
- fpm_build_and_scp install/=/usr libarvados-perl "Curoverse, Inc." dir \
- "$(version_from_git)"
+perl Makefile.PL INSTALL_BASE=install >"$PERL_OUT" && \
+ make install INSTALLDIRS=perl >"$PERL_OUT" && \
+ fpm_build_and_scp install/lib/=/usr/share libarvados-perl \
+ "Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man && \
+ mv libarvados-perl*.$FORMAT "$WORKSPACE/debs/"
# Ruby gems
if [[ "$DEBUG" != 0 ]]; then
@@ -434,10 +439,6 @@ handle_python_package
cd ../../services/nodemanager
handle_python_package
-if [[ ! -d "$WORKSPACE/debs" ]]; then
- mkdir -p $WORKSPACE/debs
-fi
-
# Arvados-src
# We use $WORKSPACE/src-build-dir as the clean directory from which to build the src package
if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
commit e5561b32e943e67eb457b8d7669e005a0338395e
Author: Brett Smith <brett at curoverse.com>
Date: Wed Jun 24 16:44:52 2015 -0400
6388: Backport pycurl package everywhere.
We need the very latest version per #6073.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 7cece07..3d7e55d 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -96,7 +96,7 @@ case "$TARGET" in
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 \
- ciso8601 pycrypto backports.ssl_match_hostname)
+ ciso8601 pycrypto backports.ssl_match_hostname pycurl)
PYTHON3_BACKPORTS=(docker-py six requests)
;;
centos6)
@@ -106,7 +106,7 @@ case "$TARGET" in
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 \
- ciso8601 pycrypto backports.ssl_match_hostname)
+ ciso8601 pycrypto backports.ssl_match_hostname pycurl)
PYTHON3_BACKPORTS=(docker-py six requests)
;;
*)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list