From 1b67aebbe5b2790f01689a8f2dd13e229cf4a596 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Thu, 29 May 2014 17:07:45 -0400 Subject: [PATCH] Run bundle clean after bundle install Running it beforehand was resulting in a corrupted state if it was the first time bundle install was run. --- jenkins/acceptance.sh | 7 ++++--- jenkins/all-tests.sh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jenkins/acceptance.sh b/jenkins/acceptance.sh index 947c3fae58..0df24ebbda 100755 --- a/jenkins/acceptance.sh +++ b/jenkins/acceptance.sh @@ -58,11 +58,12 @@ if [ -e $HOME/edx-rbenv_clean.tar.gz ]; then tar -C $HOME -xf $HOME/edx-rbenv_clean.tar.gz fi -# Ensure the Ruby environment is in a clean state and -# bootstrap Ruby requirements so we can run the tests -bundle clean --force +# Bootstrap Ruby requirements so we can run the tests bundle install +# Ensure the Ruby environment contains no stray gems +bundle clean --force + # Reset the jenkins worker's virtualenv back to the # state it was in when the instance was spun up. if [ -e $HOME/edx-venv_clean.tar.gz ]; then diff --git a/jenkins/all-tests.sh b/jenkins/all-tests.sh index deb01b1fe4..afce8b7ad1 100755 --- a/jenkins/all-tests.sh +++ b/jenkins/all-tests.sh @@ -66,11 +66,12 @@ if [ -e $HOME/edx-rbenv_clean.tar.gz ]; then tar -C $HOME -xf $HOME/edx-rbenv_clean.tar.gz fi -# Ensure the Ruby environment is in a clean state and -# bootstrap Ruby requirements so we can run the tests -bundle clean --force +# Bootstrap Ruby requirements so we can run the tests bundle install +# Ensure the Ruby environment contains no stray gems +bundle clean --force + # Reset the jenkins worker's virtualenv back to the # state it was in when the instance was spun up. if [ -e $HOME/edx-venv_clean.tar.gz ]; then