fix: removed devpi from devstack (#1150)

* fix: removed devpi from devstack * fix: docker-compose rebased * fix: optiions.mk rebased * fix: empty lines addded
openedx-unsupported · Oct 11, 2023 · be2d642 · be2d642
1 parent 0cd68ac
commit be2d642
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 95 deletions.
diff --git a/Makefile b/Makefile
@@ -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 \
@@ -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 $*
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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
@@ -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
@@ -425,7 +411,6 @@ services:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.lms"
     hostname: lms.devstack.edx
     depends_on:
-      - devpi
       - discovery
       - elasticsearch710
       - forum
@@ -604,7 +589,6 @@ services:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms"
     hostname: cms.devstack.edx
     depends_on:
-      - devpi
       - elasticsearch710
       - lms
       - memcached
@@ -854,7 +838,6 @@ services:
 volumes:
   coursegraph_data:
   discovery_assets:
-  devpi_data:
   edxapp_lms_assets:
   edxapp_cms_assets:
   elasticsearch710_data:

diff --git a/docs/devpi.rst b/docs/devpi.rst
diff --git a/docs/devstack_faq.rst b/docs/devstack_faq.rst
@@ -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
diff --git a/docs/index.rst b/docs/index.rst
@@ -21,7 +21,6 @@ Contents
    devstack_faq
    building-images
    database-dumps
-   devpi
    developing_on_named_release_branches
    pycharm_integration
    testing_and_debugging

diff --git a/options.mk b/options.mk
@@ -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