From 4f1450b9bedf60cd0f6f88553c8aab59c557e445 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 13 Jun 2012 12:21:25 -0400
Subject: [PATCH] Removed vestigal references to .cache.bundle.

Change-Id: I939119b9f1aaf71eb506c9596fc6f6bb8dff3137
---
 .../files/slave_scripts/create-tarball.sh     | 25 +------------------
 .../files/slave_scripts/run-cover.sh          |  7 +-----
 .../files/slave_scripts/run-docs.sh           |  7 +-----
 .../files/slave_scripts/run-tox.sh            |  7 +-----
 4 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/modules/jenkins_slave/files/slave_scripts/create-tarball.sh b/modules/jenkins_slave/files/slave_scripts/create-tarball.sh
index aec4f8be93..84572e53ab 100755
--- a/modules/jenkins_slave/files/slave_scripts/create-tarball.sh
+++ b/modules/jenkins_slave/files/slave_scripts/create-tarball.sh
@@ -53,30 +53,7 @@ snapshotversion=$(find_next_version)
 
 rm -f dist/*.tar.gz
 if [ -f setup.py ] ; then
-    # Try tox and cached bundles first
-    if [ -e ".cache.bundle" ] ; then
-        if [ -f tox.ini ] ; then
-            if tox --showconfig | grep testenv | grep jenkinsvenv >/dev/null 2>&1
-            then
-                tox -ejenkinsvenv python setup.py sdist
-            else
-                tox -evenv python setup.py sdist
-            fi
-        else
-            rm -rf .venv
-            mv .cache.bundle .cache.pybundle
-            virtualenv --no-site-packages .venv
-            .venv/bin/pip install .cache.pybundle
-            rm .cache.pybundle
-            tools/with_venv.sh python setup.py sdist
-        fi
-    # Try old style venv's second
-    elif [ -d .venv -a -f tools/with_venv.sh ] ; then
-        tools/with_venv.sh python setup.py sdist
-    # Last but not least, just make a tarball
-    else
-        python setup.py sdist
-    fi
+    tox -evenv python setup.py sdist
     # There should only be one, so this should be safe.
     tarball=$(echo dist/*.tar.gz)
 
diff --git a/modules/jenkins_slave/files/slave_scripts/run-cover.sh b/modules/jenkins_slave/files/slave_scripts/run-cover.sh
index 69eae689ee..7693a922ed 100755
--- a/modules/jenkins_slave/files/slave_scripts/run-cover.sh
+++ b/modules/jenkins_slave/files/slave_scripts/run-cover.sh
@@ -7,12 +7,7 @@
 # what packages we ended up testing.
 #
 
-if [ -f .cache.bundle ]
-then
-  venv=jenkinscover
-else
-  venv=cover
-fi
+venv=cover
 
 tox -e$venv
 result=$?
diff --git a/modules/jenkins_slave/files/slave_scripts/run-docs.sh b/modules/jenkins_slave/files/slave_scripts/run-docs.sh
index f0679d627a..60ab08f914 100755
--- a/modules/jenkins_slave/files/slave_scripts/run-docs.sh
+++ b/modules/jenkins_slave/files/slave_scripts/run-docs.sh
@@ -7,12 +7,7 @@
 # what packages we ended up testing.
 #
 
-if [ -f .cache.bundle ]
-then
-  venv=jenkinsvenv
-else
-  venv=venv
-fi
+venv=venv
 
 mkdir -p doc/build
 export HUDSON_PUBLISH_DOCS=1
diff --git a/modules/jenkins_slave/files/slave_scripts/run-tox.sh b/modules/jenkins_slave/files/slave_scripts/run-tox.sh
index 13472a6f99..3f4a9f8ce3 100755
--- a/modules/jenkins_slave/files/slave_scripts/run-tox.sh
+++ b/modules/jenkins_slave/files/slave_scripts/run-tox.sh
@@ -20,12 +20,7 @@ then
   exit 1
 fi
 
-if [ -f .cache.bundle ]
-then
-  venv=jenkins$version
-else
-  venv=py$version
-fi
+venv=py$version
 
 export NOSE_WITH_XUNIT=1