Jay Zoldak
|
29c4e6c066
|
Do not run the lms jasmine tests on jenkins for now, until we fix them.
|
2013-01-23 16:03:25 -05:00 |
|
Chris Dodge
|
575ff02f8a
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
Conflicts:
jenkins/test.sh
|
2013-01-18 10:26:44 -05:00 |
|
Ashley Penney
|
aeee13ab91
|
Fix the virtualenv creation for Jenkins.
|
2013-01-18 10:01:21 -05:00 |
|
Chris Dodge
|
22695d80c7
|
Merge branch 'master' into feature/cdodge/cms-master-merge4
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
|
2013-01-17 09:15:37 -05:00 |
|
Ashley Penney
|
0193cc5976
|
Remove this altogether.
|
2013-01-16 15:08:55 -05:00 |
|
Ashley Penney
|
9dd9727bb8
|
Another minor tweak to limit these tests to the cms.
|
2013-01-16 14:52:54 -05:00 |
|
Ashley Penney
|
e38b44157a
|
Lets explicitly make the virtualenvs for now.
|
2013-01-16 14:09:48 -05:00 |
|
Ashley Penney
|
093839e13d
|
flesh out comment.
|
2013-01-15 11:39:59 -05:00 |
|
Ashley Penney
|
c50c705eb6
|
Temporary workaround to our bizarre numpy issue. I think it's to do
with the way shiningpanda works but I can't see any reason why.
|
2013-01-15 11:17:45 -05:00 |
|
Calen Pennington
|
fc2d5c43f1
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
lms/envs/aws.py
|
2013-01-14 12:51:19 -05:00 |
|
Calen Pennington
|
19f79fa364
|
Prune deleted remote branches
|
2013-01-14 12:40:44 -05:00 |
|
cahrens
|
b108435a32
|
Make xmodule Jasmine tests fail build.
|
2013-01-07 10:51:32 -05:00 |
|
Chris Dodge
|
e70db062b2
|
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
requirements.txt
|
2013-01-03 10:46:24 -05:00 |
|
Calen Pennington
|
3b75bbdc6f
|
Actually run cms tests on cms master
|
2012-12-07 11:18:38 -05:00 |
|
Calen Pennington
|
38671fc83c
|
Move files from base.sh to test.sh
|
2012-12-07 11:01:58 -05:00 |
|
Calen Pennington
|
e2ed7d1c4e
|
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
|
2012-12-07 10:56:24 -05:00 |
|