Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 1cdbcea

Browse files
author
Rebecca Graber
authored
feat: do not include demo course when updating devstack initial sql scripts (#1024)
1 parent 9934a1f commit 1cdbcea

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

provision-lms.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,16 @@ docker-compose exec -T lms bash -e -c 'source /edx/app/edxapp/edxapp_env && pyth
5050

5151
# Create demo course and users
5252
#docker-compose exec -T lms bash -e -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
53-
docker-compose exec -T lms bash -e -c 'git clone https://github.com/openedx/edx-demo-course.git /tmp/edx-demo-course'
54-
docker-compose exec -T lms bash -e -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py cms --settings=devstack_docker import /edx/var/edxapp/data /tmp/edx-demo-course && rm -rf /tmp/edx-demo-course'
53+
if [[ ${DEVSTACK_SKIP_DEMO-false} == "true" ]]
54+
then
55+
echo "Skipping import of demo course. DEVSTACK_SKIP_DEMO is set to true"
56+
else
57+
docker-compose exec -T lms bash -e -c 'git clone https://github.com/openedx/edx-demo-course.git /tmp/edx-demo-course'
58+
docker-compose exec -T lms bash -e -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py cms --settings=devstack_docker import /edx/var/edxapp/data /tmp/edx-demo-course && rm -rf /tmp/edx-demo-course'
59+
# Seed forums for the demo course
60+
docker-compose exec -T lms bash -e -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker seed_permissions_roles course-v1:edX+DemoX+Demo_Course"
61+
fi
62+
5563
demo_hashed_password='pbkdf2_sha256$20000$TjE34FJjc3vv$0B7GUmH8RwrOc/BvMoxjb5j8EgnWTt3sxorDANeF7Qw='
5664
for user in honor audit verified staff ; do
5765
email="$user@example.com"
@@ -61,11 +69,13 @@ for user in honor audit verified staff ; do
6169
else
6270
docker-compose exec -T lms bash -e -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker --service-variant lms manage_user $user $email --initial-password-hash '$demo_hashed_password'"
6371
fi
72+
if [[ "${DEVSTACK_SKIP_DEMO-false}" != "true" ]]
73+
then
6474
# Enroll users in the demo course
65-
docker-compose exec -T lms bash -e -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker --service-variant lms enroll_user_in_course -e $email -c course-v1:edX+DemoX+Demo_Course"
75+
docker-compose exec -T lms bash -e -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker --service-variant lms enroll_user_in_course -e $email -c course-v1:edX+DemoX+Demo_Course"
76+
fi
6677
done
67-
# Seed forums for the demo course
68-
docker-compose exec -T lms bash -e -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker seed_permissions_roles course-v1:edX+DemoX+Demo_Course"
78+
6979

7080
# Fix missing vendor file by clearing the cache
7181
docker-compose exec -T lms bash -e -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'

update-dbs-init-sql-scripts.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ readonly MYSQL_DB_PASSWORD="password"
1313
readonly EDXAPP_DBS=("edxapp" "edxapp_csmh")
1414
DBS=("ecommerce" "${EDXAPP_DBS[@]}")
1515

16+
# don't include the demo course in the initial sql since it relies on data being present in mongo
17+
export DEVSTACK_SKIP_DEMO="true"
18+
1619

1720
# create a docker devstack with LMS and ecommerce
1821
make destroy

0 commit comments

Comments
 (0)