From 3c9d7b5b79a5d33a722c5c822aa3ebe74ac7ebb6 Mon Sep 17 00:00:00 2001 From: Joseph Mulloy Date: Thu, 5 Mar 2020 13:20:17 -0500 Subject: [PATCH 1/3] Remove duplicate service variable --- .travis/run.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis/run.sh b/.travis/run.sh index 8f2c64f39a..7258005313 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -16,9 +16,8 @@ elif [[ "$DEVSTACK" == "lms" ]]; then make healthchecks.lms healthchecks.discovery validate-lms-volume make up-marketing-detached else - service="$DEVSTACK" - make dev.provision.services."$service" - make no_cache=True dev.up."$service" + make dev.provision.services."$DEVSTACK" + make no_cache=True dev.up."$DEVSTACK" sleep 60 - make healthchecks."$service" + make healthchecks."$DEVSTACK" fi From e3519b9717c5f48f73853fe35ee253f583a13942 Mon Sep 17 00:00:00 2001 From: Joseph Mulloy Date: Thu, 5 Mar 2020 13:23:26 -0500 Subject: [PATCH 2/3] Add lms provisioning to fix travis for registrar --- .travis/run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis/run.sh b/.travis/run.sh index 7258005313..a671caf9bf 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -16,6 +16,12 @@ elif [[ "$DEVSTACK" == "lms" ]]; then make healthchecks.lms healthchecks.discovery validate-lms-volume make up-marketing-detached else + case "$DEVSTACK" in + # Other services can be added in here seperated by '|', i.e. "registrar|discovery)" + registrar) + echo "Provisioning LMS first because $DEVSTACK requires it" + make dev.provision.services.lms + esac make dev.provision.services."$DEVSTACK" make no_cache=True dev.up."$DEVSTACK" sleep 60 From b0d3982c2a7e438683df0c40302876176c34e1cc Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Thu, 5 Mar 2020 13:06:05 -0500 Subject: [PATCH 3/3] Fix stale reference to an old "values" column during provisioning Related: https://github.com/edx/edx-platform/pull/23306 DENG-18 --- programs/lms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/lms.py b/programs/lms.py index 8ec55aee72..d3a3f96877 100644 --- a/programs/lms.py +++ b/programs/lms.py @@ -31,6 +31,6 @@ def set_current_config(cls, args): site=Site.objects.get(domain='example.com'), defaults={ 'enabled': True, - 'values': {'COURSE_CATALOG_API_URL': DISCOVERY_API_URL}, + 'site_values': {'COURSE_CATALOG_API_URL': DISCOVERY_API_URL}, }, )