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

fix: removed devpi from devstack #1150

Merged
merged 7 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
dev.check-memory dev.checkout dev.clone dev.clone.https dev.clone.ssh \
dev.dbshell dev.destroy dev.down dev.drop-db dev.kill dev.logs \
dev.migrate dev.migrate.lms dev.migrate.cms \
devpi-password dev.provision dev.ps dev.pull dev.pull.without-deps \
dev.provision dev.ps dev.pull dev.pull.without-deps \
dev.reset dev.reset-repos dev.restart-container dev.restart-devserver \
dev.restart-devserver.forum dev.restore dev.rm-stopped dev.shell \
dev.shell.credentials dev.shell.discovery \
Expand Down Expand Up @@ -622,9 +622,6 @@ vnc-passwords: ## Get the VNC passwords for the Chrome and Firefox Selenium cont
@docker compose logs chrome 2>&1 | grep "VNC password" | tail -1
@docker compose logs firefox 2>&1 | grep "VNC password" | tail -1

devpi-password: ## Get the root devpi password for the devpi container.
docker compose exec devpi bash -c "cat /data/server/.serverpassword"

hadoop-application-logs-%: ## View hadoop logs by application Id.
docker compose exec nodemanager yarn logs -applicationId $*

Expand Down
17 changes: 0 additions & 17 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,6 @@ services:
environment:
NEO4J_AUTH: "neo4j/edx" # Initial username/password for Neo4j Web interface.

devpi:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.devpi"
hostname: devpi.devstack.edx
image: edxops/devpi:${OPENEDX_RELEASE:-latest}
networks:
default:
aliases:
- edx.devstack.devpi
ports:
- "3141:3141"
volumes:
- devpi_data:/data

elasticsearch710:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.elasticsearch710"
hostname: elasticsearch710.devstack.edx
Expand Down Expand Up @@ -377,7 +364,6 @@ services:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.edxnotesapi"
hostname: edx_notes_api.devstack.edx
depends_on:
- devpi
- elasticsearch710
- lms
- mysql80
Expand Down Expand Up @@ -425,7 +411,6 @@ services:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.lms"
hostname: lms.devstack.edx
depends_on:
- devpi
- discovery
- elasticsearch710
- forum
Expand Down Expand Up @@ -604,7 +589,6 @@ services:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms"
hostname: cms.devstack.edx
depends_on:
- devpi
- elasticsearch710
- lms
- memcached
Expand Down Expand Up @@ -854,7 +838,6 @@ services:
volumes:
coursegraph_data:
discovery_assets:
devpi_data:
edxapp_lms_assets:
edxapp_cms_assets:
elasticsearch710_data:
Expand Down
65 changes: 0 additions & 65 deletions docs/devpi.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/devstack_faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,10 @@ After changing settings, you can restart the LMS/CMS process without restarting
make dev.restart-devserver.cms # For CMS


What is DevPI and how does it affect Devstack?
----------------------------------------------

LMS and CMS use a devpi container to cache PyPI dependencies, which speeds up several Devstack operations.
See the `devpi documentation`_.

.. _edxops Docker image: https://hub.docker.com/r/edxops/
.. _Docker Hub: https://hub.docker.com/
.. _building images for devstack: docs/building-images.rst
.. _How do I build images?: docs/building-images.rst
.. _Changing Themes for an Open edX Site: https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/changing_appearance/theming/index.html
.. _updating relational database dumps: docs/database-dumps.rst
.. _Django Migration Don'ts: https://engineering.edx.org/django-migration-donts-f4588fd11b64
.. _devpi documentation: docs/devpi.rst
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Contents
devstack_faq
building-images
database-dumps
devpi
developing_on_named_release_branches
pycharm_integration
testing_and_debugging
Expand Down
2 changes: 1 addition & 1 deletion options.mk
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ credentials+discovery+ecommerce+insights+lms+registrar+cms
# All third-party services.
# Separated by plus signs. Listed in alphabetical order for clarity.
THIRD_PARTY_SERVICES ?= \
chrome+coursegraph+devpi+elasticsearch710+firefox+memcached+mongo+mysql57+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
chrome+coursegraph+elasticsearch710+firefox+memcached+mongo+mysql57+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica