Merge branch 'master' into 7253-add-go-sdk-manifest

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index b959cabe7b4358db7384b304215d7cfdd4ab7708..7a3a64e5dfc225283a01548a60456192b07e3b16 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -397,7 +397,7 @@ setup_virtualenv() {
     fi
     "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
     # ubuntu1404 can't seem to install mock via tests_require, but it can do this.
-    "$venvdest/bin/pip" install 'mock>=1.0'
+    "$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0'
 }
 
 export PERLINSTALLBASE