From ed9bf3805a394f6960826ee5d8683d93a3a8bb13 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 5 Aug 2014 10:27:09 -0400 Subject: [PATCH 1/2] Assume the test is being run in the correct environment. In the case of our jenkins job it is now using shining panda to manage virtual envs. --- jenkins/test.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index f9cfa77a..fb59b5d7 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -23,12 +23,6 @@ github_status state:pending "is running" # Set the IO encoding to UTF-8 so that askbot will start export PYTHONIOENCODING=UTF-8 -GIT_BRANCH=${GIT_BRANCH/HEAD/master} -if [ ! -d /mnt/virtualenvs/"$JOB_NAME" ]; then - mkdir -p /mnt/virtualenvs/"$JOB_NAME" - virtualenv /mnt/virtualenvs/"$JOB_NAME" -fi - source /mnt/virtualenvs/"$JOB_NAME"/bin/activate pip install -q -r pre-requirements.txt pip install -q -r requirements.txt From 3aecb866c471490ecc1ae4bd0f728eadb898d66d Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 5 Aug 2014 10:47:27 -0400 Subject: [PATCH 2/2] Wipe if a requirement already exists from a different source. --- jenkins/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index fb59b5d7..b0f0d436 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -24,8 +24,8 @@ github_status state:pending "is running" export PYTHONIOENCODING=UTF-8 source /mnt/virtualenvs/"$JOB_NAME"/bin/activate -pip install -q -r pre-requirements.txt -pip install -q -r requirements.txt +pip install -q -r pre-requirements.txt --exists-action w +pip install -q -r requirements.txt --exists-action w rake clobber rake pep8 || echo "pep8 failed, continuing"