From c2bc6be6d4e78da688d37ca85cd2859fb3de188d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 5 May 2012 14:37:20 -0700
Subject: [PATCH 1/2] Removed now unused old venv scripts.

Change-Id: I610869f7b447378e891a1261f7fe26bc213b0028
---
 .../files/slave_scripts/build-venv.sh         | 32 --------------
 .../files/slave_scripts/copy-venv.sh          | 43 -------------------
 2 files changed, 75 deletions(-)
 delete mode 100755 modules/jenkins_slave/files/slave_scripts/build-venv.sh
 delete mode 100755 modules/jenkins_slave/files/slave_scripts/copy-venv.sh

diff --git a/modules/jenkins_slave/files/slave_scripts/build-venv.sh b/modules/jenkins_slave/files/slave_scripts/build-venv.sh
deleted file mode 100755
index 77a9bcbc86..0000000000
--- a/modules/jenkins_slave/files/slave_scripts/build-venv.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash -xe
-
-# Make sure there is a location on this builder to cache pip downloads
-mkdir -p ~/cache/pip
-export PIP_DOWNLOAD_CACHE=~/cache/pip
-
-# Start with a clean slate
-rm -fr jenkins_venvs
-mkdir -p jenkins_venvs
-
-# Update the list of remote refs to pick up new branches
-git remote update
-
-# Build a venv for every known branch
-for branch in `git branch -r |grep "origin/"|grep -v HEAD|sed "s/origin\///"`
-do
-  echo "Building venv for $branch"
-  git checkout $branch
-  mkdir -p jenkins_venvs/$branch
-  python tools/install_venv.py
-  virtualenv --relocatable .venv
-  if [ -e tools/test-requires ]
-  then
-    pip bundle .cache.bundle -r tools/pip-requires -r tools/test-requires 
-  else
-    pip bundle .cache.bundle -r tools/pip-requires
-  fi
-  tar cvfz jenkins_venvs/$branch/venv.tgz .venv .cache.bundle
-  rm -fr .venv
-  mv .cache.bundle jenkins_venvs/$branch/
-done
-git checkout master
diff --git a/modules/jenkins_slave/files/slave_scripts/copy-venv.sh b/modules/jenkins_slave/files/slave_scripts/copy-venv.sh
deleted file mode 100755
index fd47ac8937..0000000000
--- a/modules/jenkins_slave/files/slave_scripts/copy-venv.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -xe
-
-if [ -n "$GERRIT_REFNAME" ]
-then
-  GERRIT_BRANCH=$GERRIT_REFNAME
-fi
-
-# Support jobs, such as nova-docs, which are not yet triggered by gerrit
-if [ "x$GERRIT_BRANCH" = "x" ] ; then
-  GERRIT_BRANCH=master
-fi
-mv jenkins_venvs/$GERRIT_BRANCH/venv.tgz .
-rm -fr jenkins_venvs
-tar xfz venv.tgz
-rm venv.tgz
-if [ -f .cache.bundle ] ; then
-  rm -rf .venv
-  virtualenv --no-site-packages .venv
-  pip install --upgrade -E .venv file://`pwd`/.cache.bundle
-  rm .cache.bundle
-else
-  perl -MCwd -ple '$CWD=Cwd::abs_path();s,^VIRTUAL_ENV=.*,VIRTUAL_ENV="$CWD/.venv",' -i .venv/bin/activate
-# This gets easy-install.pth as well as $PROJECT.pth.  Examples for glance:
-# easy-install.pth looks like: /home/jenkins/workspace/glance-venv/.venv/src/keystone
-# $PROJECT.pth looks like: /home/jenkins/workspace/glance-venv
-  perl -MCwd -ple '$CWD=Cwd::abs_path();s,^/.*/workspace/[^/]+(/.*)$,$CWD$1,' -i .venv/lib/python2.7/site-packages/*.pth
-# This is needed for the keystone install for glance
-  perl -MCwd -ple '$CWD=Cwd::abs_path();s,^/.*/.venv/src/(.*),$CWD/.venv/src/$1,' -i .venv/lib/python2.7/site-packages/*.egg-link
-# This is needed for the keystone install for glance
-  perl -MCwd -ple '$CWD=Cwd::abs_path();s,/.*/.venv/src/(.*),$CWD/.venv/src/$1,' -i .venv/bin/*
-fi
-if [ -f tools/test-requires ] ; then
-  TEST_REQUIRES='-r tools/test-requires'
-fi
-
-if [ -f tools/test-requires -a \
-    `git diff HEAD^1 tools/test-requires 2>/dev/null | wc -l` -gt 0 -o \
-    `git diff HEAD^1 tools/pip-requires 2>/dev/null | wc -l` -gt 0 ]
-then
-  rm -rf .venv
-  virtualenv --no-site-packages .venv
-  pip -E .venv install --upgrade -r tools/pip-requires $TEST_REQUIRES
-fi

From 7793815263188a5d211c49eed8cf13fe3877e637 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 6 May 2012 11:35:40 -0700
Subject: [PATCH 2/2] Handle empty requires lists.

Change-Id: I233547b2fd4055713c7611b7020fb3c45012e033
---
 modules/jenkins_slave/files/slave_scripts/build-bundle.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/jenkins_slave/files/slave_scripts/build-bundle.sh b/modules/jenkins_slave/files/slave_scripts/build-bundle.sh
index c5bb763062..7d8e4048fc 100755
--- a/modules/jenkins_slave/files/slave_scripts/build-bundle.sh
+++ b/modules/jenkins_slave/files/slave_scripts/build-bundle.sh
@@ -23,6 +23,9 @@ do
     if [ -f tools/test-requires ] ; then
         REQUIRES="${REQUIRES} -r tools/test-requires"
     fi
+    if [ -z "${REQUIRES}"] ; then
+        REQUIRES="distribute"
+    fi
     pip bundle $bundle $REQUIRES
 done
 git checkout master