Merge pull request #6893 from edx/clytwynec/reshard_cms_lettuce_tests

re-shard cms lettuce tests back to 1 shards

cms/djangoapps/contentstore/features/transcripts.feature

-@shard_3 @requires_stub_youtube
+@shard_1 @requires_stub_youtube
 Feature: CMS Transcripts
   As a course author, I want to be able to create video components
 

cms/djangoapps/contentstore/features/video.feature

-@shard_3 @requires_stub_youtube
+@shard_2 @requires_stub_youtube
 Feature: CMS Video Component
   As a course author, I want to be able to view my created videos in Studio
 

scripts/all-tests.sh

@@ -156,13 +156,20 @@ END
     "cms-acceptance")
         case "$SHARD" in
 
-            "all")
+            "all"|"1")
                 paver test_acceptance -s cms --extra_args="-v 3"
                 ;;
 
-            *)
-                paver test_acceptance -s cms --extra_args="-v 3 --tag shard_${SHARD}"
+            "2"|"3")
+                mkdir -p reports/acceptance
+                cat > reports/acceptance/xunit.xml <<END
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="nosetests" tests="1" errors="0" failures="0" skip="0">
+<testcase classname="lettuce.tests" name="shard_placeholder" time="0.001"></testcase>
+</testsuite>
+END
                 ;;
+
         esac
         ;;