From e2ed7d1c4e87a3af09099a31785532a56055e695 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Fri, 7 Dec 2012 10:56:24 -0500
Subject: [PATCH] Move to a single test.sh file that only runs the relevant
 tests for a particular branch in the repo. In particular, don't run cms tests
 on branches derived from master

---
 jenkins/{test_edge.sh => test.sh} |  6 ++++--
 jenkins/test_lms.sh               | 27 ---------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)
 rename jenkins/{test_edge.sh => test.sh} (77%)
 delete mode 100755 jenkins/test_lms.sh

diff --git a/jenkins/test_edge.sh b/jenkins/test.sh
similarity index 77%
rename from jenkins/test_edge.sh
rename to jenkins/test.sh
index 19ff5ecbde..ed65fd2618 100755
--- a/jenkins/test_edge.sh
+++ b/jenkins/test.sh
@@ -22,12 +22,14 @@ yes w | pip install -q -r requirements.txt
 
 rake clobber
 TESTS_FAILED=0
-rake test_cms[false] || TESTS_FAILED=1
+# Don't run the studio tests until feature/cale/cms-master is merged in
+# rake test_cms[false] || TESTS_FAILED=1
 rake test_lms[false] || TESTS_FAILED=1
 rake test_common/lib/capa || TESTS_FAILED=1
 rake test_common/lib/xmodule || TESTS_FAILED=1
 rake phantomjs_jasmine_lms || true
-rake phantomjs_jasmine_cms || true
+# Don't run the studio tests until feature/cale/cms-master is merged in
+# rake phantomjs_jasmine_cms || true
 rake coverage:xml coverage:html
 
 [ $TESTS_FAILED == '0' ]
diff --git a/jenkins/test_lms.sh b/jenkins/test_lms.sh
deleted file mode 100755
index 5a2f2a0924..0000000000
--- a/jenkins/test_lms.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/bash
-
-set -e
-set -x
-
-# Reset the submodule, in case it changed
-git submodule foreach 'git reset --hard HEAD'
-
-# Set the IO encoding to UTF-8 so that askbot will start
-export PYTHONIOENCODING=UTF-8
-
-GIT_BRANCH=${GIT_BRANCH/HEAD/master}
-
-pip install -q -r pre-requirements.txt
-pip install -q -r test-requirements.txt
-yes w | pip install -q -r requirements.txt
-
-rake clobber
-TESTS_FAILED=0
-rake test_lms[false] || TESTS_FAILED=1
-rake test_common/lib/capa || TESTS_FAILED=1
-rake test_common/lib/xmodule || TESTS_FAILED=1
-rake phantomjs_jasmine_lms || true
-rake coverage:xml coverage:html
-
-[ $TESTS_FAILED == '0' ]
-rake autodeploy_properties