Revert to OC repos(Debugging Purpose)

.circleci/config.yml

@@ -5,8 +5,8 @@ jobs:
    machine:
       enabled: true
       image: ubuntu-1604:201903-01
-
-   parallelism: 4
+   resource_class: large
+   parallelism: 12
 
    steps:
      - checkout
@@ -134,7 +134,7 @@ jobs:
          command: |
            source ~/virtualenvs/venv-3.5.2/bin/activate
            ./scripts/all-tests.sh
-         no_output_timeout: 20m
+         no_output_timeout: 120m
 
      # If you have enabled coveralls for your repo, configure your COVERALLS_REPO_TOKEN
      # as an Environment Variable in the Project Settings on CircleCI, and coverage

requirements/edx/custom.txt

@@ -1,33 +1,35 @@
+
+
 # Custom requirements to be customized by individual OpenEdX instances
 
 # When updating a hash of an XBlock that uses xblock-utils, please update its version hash in github.txt.
--e git+https://github.com/mckinseyacademy/xblock-mentoring.git@1.0#egg=xblock-mentoring==1.0
--e git+https://github.com/mckinseyacademy/xblock-image-explorer.git@v2.0#egg=xblock-image-explorer==2.0
--e git+https://github.com/mckinseyacademy/xblock-drag-and-drop.git@1.0#egg=xblock-drag-and-drop==1.0
--e git+https://github.com/mckinseyacademy/xblock-drag-and-drop-v2.git@apros-master#egg=xblock-drag-and-drop-v2==2.5.3
--e git+https://github.com/mckinseyacademy/xblock-ooyala.git@v5.0.0#egg=xblock-ooyala==5.0.0
+-e git+https://github.com/edx-solutions/xblock-mentoring.git@1.0#egg=xblock-mentoring==1.0
+-e git+https://github.com/edx-solutions/xblock-image-explorer.git@v2.0#egg=xblock-image-explorer==2.0
+-e git+https://github.com/edx-solutions/xblock-drag-and-drop.git@1.0#egg=xblock-drag-and-drop==1.0
+-e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@apros-master#egg=xblock-drag-and-drop-v2==2.5.3
+-e git+https://github.com/edx-solutions/xblock-ooyala.git@v5.0.0#egg=xblock-ooyala==5.0.0
 
-git+https://github.com/mckinseyacademy/xblock-group-project.git@1.0.0#egg=xblock-group-project==1.0.0
--e git+https://github.com/mckinseyacademy/xblock-adventure.git@1.0.1#egg=xblock-adventure==1.0.1
+git+https://github.com/edx-solutions/xblock-group-project.git@1.0.0#egg=xblock-group-project==1.0.0
+-e git+https://github.com/edx-solutions/xblock-adventure.git@1.0.1#egg=xblock-adventure==1.0.1
 -e git+https://github.com/open-craft/xblock-poll.git@v1.10.1#egg=xblock-poll==1.10.1
--e git+https://github.com/mckinseyacademy/problem-builder.git@v4.1.13#egg=xblock-problem-builder==4.1.13
-#-e git+https://github.com/mckinseyacademy/xblock-officemix.git@86238f5968a08db005717dbddc1.9.6346808f1ed3716#egg=xblock-officemix
--e git+https://github.com/mckinseyacademy/xblock-chat.git@v0.3.0#egg=chat-xblock==0.3.0
--e git+https://github.com/mckinseyacademy/xblock-eoc-journal.git@v0.10.1#egg=xblock-eoc-journal==0.10.1
+-e git+https://github.com/open-craft/problem-builder.git@v4.1.13#egg=xblock-problem-builder==4.1.13
+#-e git+https://github.com/OfficeDev/xblock-officemix.git@86238f5968a08db005717dbddc1.9.6346808f1ed3716#egg=xblock-officemix
+-e git+https://github.com/open-craft/xblock-chat.git@v0.3.0#egg=chat-xblock==0.3.0
+-e git+https://github.com/open-craft/xblock-eoc-journal.git@v0.10.1#egg=xblock-eoc-journal==0.10.1
 -e git+https://github.com/mckinseyacademy/xblock-scorm.git@v3.2.2#egg=xblock-scorm==3.2.2
 -e git+https://github.com/mckinseyacademy/xblock-diagnosticfeedback.git@v0.4.1#egg=xblock-diagnostic-feedback==0.4.1
 
--e git+https://github.com/mckinseyacademy/xblock-group-project-v2.git@0.12.14#egg=xblock-group-project-v2==0.12.14
--e git+https://github.com/mckinseyacademy/xblock-virtualreality.git@v0.1.5#egg=xblock-virtualreality==0.1.5
+-e git+https://github.com/open-craft/xblock-group-project-v2.git@0.12.14#egg=xblock-group-project-v2==0.12.14
+-e git+https://github.com/open-craft/xblock-virtualreality.git@v0.1.5#egg=xblock-virtualreality==0.1.5
 
--e git+https://github.com/mckinseyacademy/edx-notifications.git@3.0.0#egg=edx-notifications==3.0.0
-git+https://github.com/mckinseyacademy/gradebook-edx-platform-extensions.git@3.0.3#egg=gradebook-edx-platform-extensions==3.0.3
-git+https://github.com/mckinseyacademy/mobileapps-edx-platform-extensions.git@3.0.0#egg=mobileapps-edx-platform-extensions==3.0.0
-git+https://github.com/mckinseyacademy/discussion-edx-platform-extensions.git@3.0.1#egg=discussion-edx-platform-extensions==3.0.1
-git+https://github.com/mckinseyacademy/organizations-edx-platform-extensions.git@v3.0.1#egg=organizations-edx-platform-extensions==3.0.1
-git+https://github.com/mckinseyacademy/course-edx-platform-extensions.git@v4.0.0#egg=course-edx-platform-extensions==4.0.0
-git+https://github.com/mckinseyacademy/projects-edx-platform-extensions.git@v4.0.0#egg=projects-edx-platform-extensions==4.0.0
-git+https://github.com/mckinseyacademy/api-integration.git@v2.0.0#egg=api-integration==2.0.0
+-e git+https://github.com/edx/edx-notifications.git@3.0.0#egg=edx-notifications==3.0.0
+git+https://github.com/edx-solutions/gradebook-edx-platform-extensions.git@3.0.3#egg=gradebook-edx-platform-extensions==3.0.3
+git+https://github.com/edx-solutions/mobileapps-edx-platform-extensions.git@3.0.0#egg=mobileapps-edx-platform-extensions==3.0.0
+git+https://github.com/edx-solutions/discussion-edx-platform-extensions.git@3.0.1#egg=discussion-edx-platform-extensions==3.0.1
+git+https://github.com/edx-solutions/organizations-edx-platform-extensions.git@v3.0.1#egg=organizations-edx-platform-extensions==3.0.1
+git+https://github.com/edx-solutions/course-edx-platform-extensions.git@v4.0.0#egg=course-edx-platform-extensions==4.0.0
+git+https://github.com/edx-solutions/projects-edx-platform-extensions.git@v4.0.0#egg=projects-edx-platform-extensions==4.0.0
+git+https://github.com/edx-solutions/api-integration.git@v5.0.4#egg=api-integration==5.0.4
 
 git+https://github.com/mckinseyacademy/openedx-user-manager-api@v2.0.1#egg=openedx-user-manager-api==2.0.1
 openedx-completion-aggregator==3.0.3

scripts/circle-ci-tests.sh

@@ -48,7 +48,7 @@ if [ "$CIRCLE_NODE_TOTAL" == "1" ] ; then
 
     exit $EXIT
 else
-    # Split up the tests to run in parallel on 4 containers
+    # Split up the tests to run in parallel on 22 containers
     case $CIRCLE_NODE_INDEX in
         0)  # run the quality metrics
             echo "Finding fixme's and storing report..."
@@ -80,8 +80,9 @@ else
             exit $EXIT
             ;;
 
-        1)  # run all of the lms unit tests
-            paver test_system -s lms --cov-args="-p" --disable-migrations
+        1)  # run selected of the lms unit tests
+            #paver test_system -s lms --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t discussion --cov-args="-p" --disable-migrations
             ;;
 
         2)  # run all of the cms unit tests
@@ -99,6 +100,55 @@ else
             paver test_system -s lms --pyargs -t mobileapps --disable-migrations
             ;;
 
+        4)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t course_api --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t grades --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t instructor --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t staticbook --cov-args="-p" --disable-migrations
+            ;;
+
+        5)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t course_blocks --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t learner_dashboard --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t support --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t survey --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t teams --cov-args="-p" --disable-migrations
+            ;;
+
+        6)  # run selected of the lms unit tests
+            #paver test_system -s lms --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t mobile_api --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t instructor_analytics --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t tests --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t verify_student --cov-args="-p" --disable-migrations
+            ;;
+
+        7)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t dashboard --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t courseware --cov-args="-p" --disable-migrations
+            ;;
+
+        8)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t badges --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t branding --cov-args="-p" --disable-migrations
+            ;;
+
+        9)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t bulk_email --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t bulk_enroll --cov-args="-p" --disable-migrations
+            ;;
+
+        10)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t ccx --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t certificates --cov-args="-p" --disable-migrations
+            ;;
+
+        11)  # run selected of the lms unit tests
+            paver test_system -s lms --pyargs -t commerce --cov-args="-p" --disable-migrations
+            paver test_system -s lms --pyargs -t course_goals --cov-args="-p" --disable-migrations
+            ;;
+
+
         *)
             echo "No tests were executed in this container."
             echo "Please adjust scripts/circle-ci-tests.sh to match your parallelism."