Merge pull request #1078 from MITx/feature/jzoldak/jenkins-cleanup

Add pip install of test requirements, remove askbot requirements.

jenkins/test_edge.sh

@@ -12,8 +12,8 @@ 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
-[ ! -d askbot ] || pip install -q -r askbot/askbot_requirements.txt
 
 rake clobber
 TESTS_FAILED=0

jenkins/test_lms.sh

@@ -12,8 +12,8 @@ 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
-[ ! -d askbot ] || pip install -q -r askbot/askbot_requirements.txt
 
 rake clobber
 TESTS_FAILED=0