From 7b029c87d19781b45c18a71f706421ec8aa136c5 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 29 Jan 2014 14:23:02 +0000
Subject: [PATCH] Temporarily pin tox<=1.6.1

The release of tox 1.7.0 happened today, and we're clearly not ready
for it yet. Stop the bleeding by sticking with 1.6.1 while we try to
sort out the issues.

Change-Id: I3289828ea9a0edadcf40c06212b0925957b99f73
Related-Bug: #1274135
---
 modules/jenkins/manifests/slave.pp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index c1b63e8ec1..bdcebbfa75 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -148,9 +148,9 @@ class jenkins::slave(
   }
 
   # Packages that need to be installed from pip
+  # Temporarily removed tox so we can pin it separately (see below)
   $pip_packages = [
     'setuptools-git',
-    'tox',
   ]
 
   if $python3 {
@@ -165,12 +165,24 @@ class jenkins::slave(
       provider => pip3,
       require  => Class[pip::python3],
     }
+    # Temporarily handle tox separately so we can pin it
+    package { 'tox':
+      ensure   => '1.6.1',
+      provider => pip3,
+      require  => Class['pip::python3'],
+    }
   } else {
     package { $pip_packages:
       ensure   => latest,  # we want the latest from these
       provider => pip,
       require  => Class[pip],
     }
+    # Temporarily handle tox separately so we can pin it
+    package { 'tox':
+      ensure   => '1.6.1',
+      provider => pip,
+      require  => Class['pip'],
+    }
   }
 
   package { 'python-subunit':