From 25541f1ec593d51779f9742221a63e76590e95c6 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 23 Dec 2014 10:42:31 -0800
Subject: [PATCH] We want to run freese in venv not with tox target

Running the freeze command as posargs to tox targets is unreliable as
those commands may be interpreted as arguments to other commands rather
than as commands themselves. For example `tox -epy26 -- pbr freeze` is
likely pass 'pbr freeze' as test name filters to the py26 test runner.

Instead what we want is to run pbr/pip freeze directly out of the venv
in question.

Change-Id: Iefb8ae4e82dcd31306d03befdc9766f2c1291571
---
 jenkins/scripts/run-cover.sh    | 2 +-
 jenkins/scripts/run-docs.sh     | 2 +-
 jenkins/scripts/run-pep8.sh     | 2 +-
 jenkins/scripts/run-selenium.sh | 2 +-
 jenkins/scripts/run-tox.sh      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jenkins/scripts/run-cover.sh b/jenkins/scripts/run-cover.sh
index e0bc93f063..c89e4e6cc1 100755
--- a/jenkins/scripts/run-cover.sh
+++ b/jenkins/scripts/run-cover.sh
@@ -19,7 +19,7 @@ result=$?
 
 echo "Begin $freezecmd freeze output from test virtualenv:"
 echo "======================================================================"
-tox -e$venv -- $freezecmd freeze
+.tox/${venv}/bin/${freezecmd} freeze
 echo "======================================================================"
 
 exit $result
diff --git a/jenkins/scripts/run-docs.sh b/jenkins/scripts/run-docs.sh
index 89ec1064c1..23484ecfb5 100755
--- a/jenkins/scripts/run-docs.sh
+++ b/jenkins/scripts/run-docs.sh
@@ -12,7 +12,7 @@ venv=venv
 
 echo "Begin pbr freeze output from test virtualenv:"
 echo "======================================================================"
-tox -e$venv -- $freezecmd freeze
+.tox/${venv}/bin/${freezecmd} freeze
 echo "======================================================================"
 
 mkdir -p doc/build
diff --git a/jenkins/scripts/run-pep8.sh b/jenkins/scripts/run-pep8.sh
index 09e71db554..28d8b624e4 100755
--- a/jenkins/scripts/run-pep8.sh
+++ b/jenkins/scripts/run-pep8.sh
@@ -23,7 +23,7 @@ rc=$?
 
 echo "Begin $freezecmd freeze output from test virtualenv:"
 echo "======================================================================"
-tox -e$venv -- $freezecmd freeze
+.tox/${venv}/bin/${freezecmd} freeze
 echo "======================================================================"
 
 exit $rc
diff --git a/jenkins/scripts/run-selenium.sh b/jenkins/scripts/run-selenium.sh
index b0f959a826..0c818a0c01 100755
--- a/jenkins/scripts/run-selenium.sh
+++ b/jenkins/scripts/run-selenium.sh
@@ -25,7 +25,7 @@ set -e
 
 echo "Begin $freezecmd freeze output from test virtualenv:"
 echo "======================================================================"
-tox -e$venv -- $freezecmd freeze
+.tox/${venv}/bin/${freezecmd} freeze
 echo "======================================================================"
 
 exit $result
diff --git a/jenkins/scripts/run-tox.sh b/jenkins/scripts/run-tox.sh
index cdc697efec..42ed515596 100755
--- a/jenkins/scripts/run-tox.sh
+++ b/jenkins/scripts/run-tox.sh
@@ -38,7 +38,7 @@ result=$?
 
 echo "Begin $freezecmd freeze output from test virtualenv:"
 echo "======================================================================"
-tox -e$venv -- $freezecmd freeze
+.tox/${venv}/bin/${freezecmd} freeze
 echo "======================================================================"
 
 if [ -d ".testrepository" ] ; then