Add libcloud-pin and update to dev3 refs #7031

diff --git a/jenkins/libcloud-pin b/jenkins/libcloud-pin
new file mode 100644 (file)
index 0000000..4ebd37f
--- /dev/null
+++ b/jenkins/libcloud-pin
@@ -0,0 +1 @@
+LIBCLOUD_PIN=0.18.1.dev3
\ No newline at end of file

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 31bf7084f1cee8e138963a257b340b913afe533a..8fba12a263cae7bd9da834fd62b18b719dd68130 100755 (executable)
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . `dirname "$(readlink -f "$0")"`/run-library.sh
+. `dirname "$(readlink -f "$0")"`/libcloud-pin
 
 read -rd "\000" helpmessage <<EOF
 $(basename $0): Build Arvados packages
@@ -394,7 +395,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.dev2
+    git checkout apache-libcloud-$LIBCLOUD_PIN
     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 82645916c0cfcb987330f012dd0f8b531cfc1942..43a8acb317c056c854e243e9e91a70a9373e6757 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. `dirname "$(readlink -f "$0")"`/libcloud-pin
+
 read -rd "\000" helpmessage <<EOF
 $(basename $0): Install and test Arvados components.
 
@@ -419,8 +421,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.dev2 \
-    || pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev2.zip >/dev/null \
+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"
 
 # If Python 3 is available, set up its virtualenv in $VENV3DIR.