Skip to content

Commit c041548

Browse files
feanilfeanil
committed
Drop support for edx-mktg development.
The drupal marketing site is no longer in use so drop support for being able to develop with it.
1 parent b1ac498 commit c041548

14 files changed

Lines changed: 16 additions & 183 deletions

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ env:
2121
- SERVICES=edx_notes_api
2222
- SERVICES=credentials
2323
- SERVICES=xqueue
24-
- SERVICES=marketing
2524

2625
services:
2726
- docker

‎Makefile‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
# All devstack targets are "PHONY" in that they do not name actual files.
4343
# Thus, all non-parameterized targets should be added to this declaration.
44-
.PHONY: build-courses clean-marketing-sync \
44+
.PHONY: build-courses \
4545
create-test-course dev.attach dev.backup dev.cache-programs dev.check \
4646
dev.check-memory dev.checkout dev.clone dev.clone.https dev.clone.ssh \
4747
dev.dbshell dev.destroy dev.down dev.drop-db dev.kill dev.logs \
@@ -51,15 +51,15 @@
5151
dev.restart-devserver.forum dev.restore dev.rm-stopped dev.shell \
5252
dev.shell.credentials dev.shell.discovery \
5353
dev.shell.ecommerce dev.shell.lms dev.shell.lms_watcher \
54-
dev.shell.marketing dev.shell.registrar dev.shell.studio \
54+
dev.shell.registrar dev.shell.studio \
5555
dev.shell.studio_watcher dev.shell.xqueue dev.shell.xqueue_consumer \
5656
dev.static dev.static.lms dev.static.studio dev.stats dev.status \
5757
dev.stop dev.sync.daemon.start dev.sync.provision \
5858
dev.sync.requirements dev.sync.up dev.up dev.up.attach dev.up.shell \
5959
dev.up.without-deps dev.up.without-deps.shell dev.up.with-programs \
6060
dev.up.with-watchers dev.validate e2e-tests e2e-tests.with-shell \
6161
help requirements selfcheck upgrade upgrade \
62-
up-marketing-sync validate-lms-volume vnc-passwords
62+
validate-lms-volume vnc-passwords
6363

6464
# Load up options (configurable through options.local.mk).
6565
include options.mk
@@ -80,7 +80,6 @@ COMPOSE_FILE := docker-compose-host.yml
8080
COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-themes.yml
8181
COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-watchers.yml
8282
COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-xqueue.yml
83-
COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-marketing-site.yml
8483
endif
8584

8685
# Files for use with Network File System -based synchronization.
@@ -94,7 +93,6 @@ endif
9493
ifeq ($(FS_SYNC_STRATEGY),docker-sync)
9594
COMPOSE_FILE := docker-compose-host.yml
9695
COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-sync.yml
97-
COMPOSE_FILE := $(COMPOSE_FILE):docker-sync-marketing-site.yml
9896
endif
9997

10098
ifndef COMPOSE_FILE
@@ -425,9 +423,6 @@ dev.shell.studio_watcher:
425423
dev.shell.xqueue_consumer:
426424
docker-compose exec xqueue_consumer env TERM=$(TERM) /edx/app/xqueue/devstack.sh open
427425

428-
dev.shell.marketing:
429-
docker-compose exec marketing env TERM=$(TERM) bash -c 'cd /edx/app/edx-mktg/edx-mktg; exec /bin/bash -sh'
430-
431426
dev.dbshell:
432427
docker-compose exec mysql57 bash -c "mysql"
433428

@@ -603,19 +598,12 @@ devpi-password: ## Get the root devpi password for the devpi container.
603598
hadoop-application-logs-%: ## View hadoop logs by application Id.
604599
docker-compose exec nodemanager yarn logs -applicationId $*
605600

606-
create-test-course: ## Provisions studio, ecommerce, and marketing with course(s) in test-course.json.
607-
# NOTE: marketing course creation is not available for those outside edX
608-
$(WINPTY) bash ./course-generator/create-courses.sh --studio --ecommerce --marketing course-generator/test-course.json
601+
create-test-course: ## Provisions studio, and ecommerce with course(s) in test-course.json.
602+
$(WINPTY) bash ./course-generator/create-courses.sh --studio --ecommerce course-generator/test-course.json
609603

610-
build-courses: ## Build course and provision studio, ecommerce, and marketing with it.
604+
build-courses: ## Build course and provision studio, and ecommerce with it.
611605
# Modify test-course.json before running this make target to generate a custom course
612-
# NOTE: marketing course creation is not available for those outside edX
613606
$(WINPTY) bash ./course-generator/build-course-json.sh course-generator/tmp-config.json
614-
$(WINPTY) bash ./course-generator/create-courses.sh --studio --ecommerce --marketing course-generator/tmp-config.json
607+
$(WINPTY) bash ./course-generator/create-courses.sh --studio --ecommerce course-generator/tmp-config.json
615608
rm course-generator/tmp-config.json
616609

617-
up-marketing-sync: ## Bring up all services (including the marketing site) with docker-sync.
618-
docker-sync-stack start -c docker-sync-marketing-site.yml
619-
620-
clean-marketing-sync: ## Remove the docker-sync containers for all services (including the marketing site).
621-
docker-sync-stack clean -c docker-sync-marketing-site.yml

‎README.rst‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,6 @@ Alternatively, you can run these by modifying the ``DEFAULT_SERVICES`` option as
364364
+------------------------------------+-------------------------------------+----------------+--------------+
365365
| `xqueue`_ | http://localhost:18040/api/v1/ | Python/Django | Extra |
366366
+------------------------------------+-------------------------------------+----------------+--------------+
367-
| `marketing`_ | http://localhost:8080/ | PHP/Drupal | edX.org-only |
368-
+------------------------------------+-------------------------------------+----------------+--------------+
369367

370368
.. _credentials: https://github.com/edx/credentials
371369
.. _discovery: https://github.com/edx/course-discovery
@@ -379,7 +377,6 @@ Alternatively, you can run these by modifying the ``DEFAULT_SERVICES`` option as
379377
.. _registrar: https://github.com/edx/registrar
380378
.. _studio: https://github.com/edx/edx-platform
381379
.. _lms: https://github.com/edx/edx-platform
382-
.. _marketing: https://github.com/edx/edx-mktg
383380
.. _frontend-app-learning: https://github.com/edx/frontend-app-learning
384381
.. _frontend-app-library-authoring: https://github.com/edx/frontend-app-library-authoring
385382
.. _course-authoring: https://github.com/edx/frontend-app-course-authoring
@@ -762,7 +759,7 @@ Following directions `Changing Themes for an Open edX Site`_ to get started. You
762759

763760
Devstack Envs Configuration
764761
********************************
765-
Make sure that you enable the following code in ./edx-platform/lms/envs/devstack.py as this will make sure that you have the appropriate Mako template overrides applied for your theme. Forgetting to enable this will not allow your theme template files to be overriden by the platform. See `discuss 3557 <https://discuss.openedx.org/t/enable-comprehensive-theming-devstack-mako-template-overrides-not-working/3557>`__ for details concerning issues with not enabling the following code.
762+
Make sure that you enable the following code in ./edx-platform/lms/envs/devstack.py as this will make sure that you have the appropriate Mako template overrides applied for your theme. Forgetting to enable this will not allow your theme template files to be overriden by the platform. See `discuss 3557 <https://discuss.openedx.org/t/enable-comprehensive-theming-devstack-mako-template-overrides-not-working/3557>`__ for details concerning issues with not enabling the following code.
766763

767764
.. code:: python
768765
@@ -809,15 +806,6 @@ If you have trouble connecting, ensure the port was mapped successfully by
809806
running ``make dev.ps`` and looking for a line like this:
810807
``edx.devstack.mysql docker-entrypoint.sh mysql ... Up 0.0.0.0:3506→3306/tcp``.
811808

812-
How do I run the edX.org Drupal Marketing Site?
813-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
814-
815-
The edX.org marketing site built on Drupal is being deprecated, but it can still be run via Devstack.
816-
See the `Marketing Site instructions`_ for details on getting it up and running.
817-
This will not be useful to those outside of edX, Inc, as the marketing site is closed-source
818-
and is not built with Open edX usage in mind.
819-
820-
821809
How do I build the service images myself?
822810
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
823811

@@ -1482,7 +1470,6 @@ As a specific example, if ``OPENEDX_RELEASE`` is set in your environment as ``ju
14821470
.. _Django Migration Don'ts: https://engineering.edx.org/django-migration-donts-f4588fd11b64
14831471
.. _Python virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/#lower-level-virtualenv
14841472
.. _Community: https://open.edx.org/community/connect/
1485-
.. _Marketing site instructions: https://openedx.atlassian.net/wiki/spaces/ENG/pages/159162183/Marketing+Site
14861473
.. _updating relational database dumps: docs/database-dumps.rst
14871474
.. _building images for devstack: docs/building-images.rst
14881475
.. _Understanding Git Conceptually: https://www.sbf5.com/~cduan/technical/git/

‎check.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ if should_check xqueue; then
111111
"curl --fail -L http://localhost:18040/xqueue/status"
112112
fi
113113

114-
if should_check marketing; then
115-
echo "Seeing if we can curl root of Marketing site: "
116-
run_check marketing_curl marketing \
117-
"curl --fail -L http://localhost:8080"
118-
fi
119-
120114
echo "Successful checks:${succeeded:- NONE}"
121115
echo "Failed checks:${failed:- NONE}"
122116
if [[ "$succeeded" ]]; then

‎compatibility.mk‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
.PHONY: backup check-memory destroy \
1515
dev.provision.services dev.repo.reset \
1616
dev.up.all dev.up.watchers down \
17-
down-marketing e2e-shell healthchecks help-marketing lms-restart \
17+
e2e-shell healthchecks lms-restart \
1818
lms-watcher-shell logs provision pull \
1919
pull.xqueue restore static stats stop stop.all \
20-
stop-marketing stop.watchers stop.xqueue studio-restart \
21-
studio-watcher-shell up-marketing up-marketing-detached validate \
20+
stop.watchers stop.xqueue studio-restart \
21+
studio-watcher-shell validate \
2222
xqueue_consumer-restart xqueue-restart
2323

2424
#####################################################################
@@ -57,18 +57,10 @@ dev.up.watchers: dev.up.lms_watcher+studio_watcher
5757

5858
down: dev.down
5959

60-
down-marketing: dev.down
61-
6260
e2e-shell: e2e-tests.with-shell
6361

6462
healthchecks: dev.check
6563

66-
help-marketing:
67-
@echo "This command is deprecated."
68-
@echo "All Marketing Site commands can be expressed using the standard Devstack command format."
69-
@echo "For example, 'make dev.up.marketing' brings up the Marketing Site service,"
70-
@echo "and 'make dev.shell.marketing' creates a shell into it."
71-
7264
lms-restart: dev.restart-devserver.lms
7365

7466
lms-watcher-shell: dev.shell.lms_watcher
@@ -91,8 +83,6 @@ stop.all: dev.stop
9183

9284
stop: dev.stop
9385

94-
stop-marketing: dev.stop
95-
9686
stop.watchers: dev.stop.lms_watcher+studio_watcher
9787

9888
stop.xqueue: dev.stop.xqueue+xqueue_consumer
@@ -101,10 +91,6 @@ studio-restart: dev.restart-devserver.studio
10191

10292
studio-watcher-shell: dev.shell.studio_watcher
10393

104-
up-marketing-detached: dev.up.$(DEFAULT_SERVICES)+marketing
105-
106-
up-marketing: dev.up.attach.marketing
107-
10894
validate: dev.validate
10995

11096
xqueue_consumer-restart: dev.restart-devserver.xqueue_consumer

‎course-generator/create-courses.sh‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env bash
2-
# Script that provisions studio, ecommerce, marketing with courses
3-
# USAGE: ./create-courses [--studio] [--ecommerce] [--marketing] course-config.json
2+
# Script that provisions studio, and ecommerce with courses
3+
# USAGE: ./create-courses [--studio] [--ecommerce] course-config.json
44
studio=false
55
ecommerce=false
6-
marketing=false
76
echo "Parsing options"
87
container_error=false
98
for arg in "$@"; do
@@ -21,16 +20,10 @@ for arg in "$@"; do
2120
else
2221
ecommerce=true
2322
fi
24-
elif [ $arg == "--marketing" ]; then
25-
if [ ! "$(docker-compose exec marketing bash -c 'echo "Course will be created for marketing"; exit $?')" ]; then
26-
echo "Issue with marketing container. Course creation will proceed without marketing container."
27-
else
28-
marketing=true
29-
fi
3023
fi
3124
done
3225

33-
if $container_error; then
26+
if $container_error; then
3427
echo "Aborting course creation. Check your containers"
3528
exit
3629
fi
@@ -39,7 +32,7 @@ fi
3932
## This will allow users to rerun the command multiple times and avoid duplicate course ids
4033
course_config_file="${@: -1}"
4134
if [[ ! -f $course_config_file ]] ; then
42-
echo "$course_config_file does not exist. Must provide a valid course config file."
35+
echo "$course_config_file does not exist. Must provide a valid course config file."
4336
exit
4437
fi
4538
course_json=""
@@ -56,8 +49,3 @@ if $ecommerce ; then
5649
echo "Creating courses on ecommerce."
5750
docker-compose exec ecommerce bash -c "source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py generate_courses '$course_json'"
5851
fi
59-
60-
if $marketing ; then
61-
echo "Creating courses on marketing."
62-
docker-compose exec marketing bash -c "drush generate_courses '$course_json'"
63-
fi

‎docker-compose-marketing-site-host.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎docker-compose-marketing-site-sync.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docker-compose-marketing-site.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎docker-sync-marketing-site.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)