[ARVADOS] created: 1.1.3-139-gc6e1f62

Git user git at public.curoverse.com
Tue Mar 6 10:58:01 EST 2018


        at  c6e1f628cc07731cd5fdee991fbd49564dab44b7 (commit)


commit c6e1f628cc07731cd5fdee991fbd49564dab44b7
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Mar 6 12:56:52 2018 -0300

    12268: Fix package build scripts
    
    Libcloud now is built from official sources instead of our fork.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/build/build.list b/build/build.list
index 84ef784..82c71d0 100644
--- a/build/build.list
+++ b/build/build.list
@@ -5,6 +5,7 @@
 #distribution(s)|name|version|iteration|type|architecture|extra fpm arguments
 debian8,debian9,ubuntu1204,centos7|python-gflags|2.0|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.6.2|2|python|all
+debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|apache-libcloud|2.3.0|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,centos7|oauth2client|1.5.2|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index c56b740..fdb6954 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -486,24 +486,6 @@ if [[ "$?" == "0" ]]; then
   fpm_build $WORKSPACE/tools/crunchstat-summary ${PYTHON2_PKG_PREFIX}-crunchstat-summary 'Curoverse, Inc.' 'python' "$crunchstat_summary_version" "--url=https://arvados.org" "--description=Crunchstat-summary reads Arvados Crunch log files and summarize resource usage" --iteration "$iteration"
 fi
 
-# Forked libcloud
-if test_package_presence "$PYTHON2_PKG_PREFIX"-apache-libcloud "$LIBCLOUD_PIN" python 2
-then
-  LIBCLOUD_DIR=$(mktemp -d)
-  (
-      cd $LIBCLOUD_DIR
-      git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
-      git checkout $DASHQ_UNLESS_DEBUG apache-libcloud-$LIBCLOUD_PIN
-      # libcloud is absurdly noisy without -q, so force -q here
-      OLD_DASHQ_UNLESS_DEBUG=$DASHQ_UNLESS_DEBUG
-      DASHQ_UNLESS_DEBUG=-q
-      handle_python_package
-      DASHQ_UNLESS_DEBUG=$OLD_DASHQ_UNLESS_DEBUG
-  )
-  fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud "" python "" --iteration 2
-  rm -rf $LIBCLOUD_DIR
-fi
-
 # Python 2 dependencies
 declare -a PIP_DOWNLOAD_SWITCHES=(--no-deps)
 # Add --no-use-wheel if this pip knows it.

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list