Move to a single test.sh file that only runs the relevant tests for a particular…

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 → 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' ]

jenkins/test_lms.sh

-#! /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