Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module

[replaceafill]

In a sandbox setup, the course export functionality throws this error if the file system is used as storage:

This is caused because the MEDIA_ROOT and MEDIA_URL settings are not set explicitly in the cms configuration and their default values (empty strings) are used to calculate the base location of the storage, breaking the Celery task.

This PR reuses both settings from the lms.envs.common module and allows to override them through ENV_TOKENS fixing this permission issue.

Sandbox URL

LMS: https://pr14831.sandbox.opencraft.hosting
Studio: https://studio-pr14831.sandbox.opencraft.hosting

Testing instructions

1. Set up a sandbox
2. Try to export the demo course and you should see the permission error in the screenshot above
3. Set this branch in /edx/app/edxapp/edx-platform
4. Restart the supervisor service
5. Exporting the demo course should work now

Note: This change was first created under https://github.com/edx/edx-platform/pull/15005, but had to be reverted because the bokchoy tests failed.

[openedx-webhooks]

Thanks for the pull request, @replaceafill! It looks like you're a member of a company that does contract work for edX. If you're doing this work as part of a paid contract with edX, you should talk to edX about who will review this pull request. If this work is not part of a paid contract with edX, then you should ensure that there is an OSPR issue to track this work in JIRA, so that we don't lose track of your pull request.

Create an OSPR issue for this pull request.

[replaceafill]

@estute I created this PR to fix the failing bokchoy tests of https://github.com/edx/edx-platform/pull/15296. I can see the same failures here too.

However, I haven't been able to reproduce them in my devstack. I first tried running the tests just for the studio/test_import_export.py module like this:

edxapp@vagrant:~/edx-platform$ paver test_bokchoy -t studio/test_import_export.py

which produced no failures: https://pastebin.com/9Sa8qs15

And then, after inspecting the Jenkins logs, using shards like this:

edxapp@vagrant:~/edx-platform$ paver test_bokchoy --attr="shard=7" --with-flaky --with-xunit

which didn't produced failures either: https://pastebin.com/D7Um2y62

How should I run the tests in my devstack in order to get the same failures Jenkins reports? Thanks!

[replaceafill]

jenkins run bokchoy

[replaceafill]

@jibsheet @estute Could you please take a look? This PR fixes the bokchoy failures of https://github.com/edx/edx-platform/pull/15005

[openedx-webhooks]

Thanks for the pull request, @replaceafill! I've created OSPR-1807 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams.

Feel free to add as much of the following information to the ticket:

• supporting documentation
• edx-code email threads
• timeline information ("this must be merged by XX date", and why that is)
• partner information ("this is a course on edx.org")
• any other information that can help Product understand the context for the PR

All technical communication about the code itself will still be done via the GitHub pull request interface. As a reminder, our process documentation is here.

If you like, you can add yourself to the AUTHORS file for this repo, though that isn't required. Please see the CONTRIBUTING file for more information.

[antoviaque]

@jibsheet @estute Will you be able to have a look at this soon? We would like to have this merged for Ginkgo.

[pomegranited]

Works great! Thanks @replaceafill .

👍

• I tested this using the described instructions. I also tested importing the exported course, just to be sure.
• I read through the code
• I checked for accessibility issues No change to the user-facing GUI.
• Includes documentation - contains some docstrings, but it's a bugfix, so doesn't require user-facing docs.

[cahrens]

@jibsheet it looks like you reviewed the earlier version of this. Are you able to OK this PR, or does it require an explicit Educator review?

[jibsheet]

@cahrens I'd love someone else to look at the bok_choy.json change that fixed tests. I'm fine with the rest of the prod-facing changes, but don't have as much bok choy familiarity to be sure about the test fix.

[cahrens]

It appears that these are the same settings that are already in lms/envs/bok_choy.py. Therefore I think this change makes sense.

https://github.com/edx/edx-platform/blob/master/lms/envs/bok_choy.py#L67

FYI @jzoldak, in case you have any concerns.

[cahrens]

@jibsheet It appears that the changes to bok_choy.py just duplicate what already is in the lms version of bok_choy.py. So I think this is fine-- I have tagged @jzoldak just to be sure.

If there are no concerns, I will merge this later today.

[pomegranited]

Thanks @cahrens and @jibsheet !

[edx-pipeline-bot]

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production on Friday, July 07, 2017.

[nedbat]

This merge was after the release that became Gingko. This will need to be cherry-picked if it's to be part of Ginkgo.

[nedbat]

Since it was merged, I went ahead and cherry-picked it.

[edx-pipeline-bot]

EdX Release Notice: This PR has been deployed to the production environment.