From 51c3e7507403e1d7b49eec2b17c0b67f5d74ce6f Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 28 Dec 2022 05:30:38 +0530
Subject: [PATCH] fix: tests use erpnext images

---
 compose.yaml                   |  2 +-
 overrides/compose.erpnext.yaml | 27 ---------------------------
 tests/compose.ci-erpnext.yaml  | 24 ------------------------
 tests/utils.py                 |  2 --
 4 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 overrides/compose.erpnext.yaml
 delete mode 100644 tests/compose.ci-erpnext.yaml

diff --git a/compose.yaml b/compose.yaml
index c27a9072..a05f9ddf 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -5,7 +5,7 @@ x-depends-on-configurator: &depends_on_configurator
 
 x-backend-defaults: &backend_defaults
   <<: *depends_on_configurator
-  image: frappe/frappe-worker:${FRAPPE_VERSION:?No Frappe version set}
+  image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No Frappe version set}
   volumes:
     - sites:/home/frappe/frappe-bench/sites
     - assets:/home/frappe/frappe-bench/sites/assets:ro
diff --git a/overrides/compose.erpnext.yaml b/overrides/compose.erpnext.yaml
deleted file mode 100644
index 72c7b906..00000000
--- a/overrides/compose.erpnext.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-x-erpnext-backend-image: &erpnext_backend_image
-  image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No ERPNext version set}
-  volumes:
-    - sites:/home/frappe/frappe-bench/sites
-    - assets:/home/frappe/frappe-bench/sites/assets:ro
-
-services:
-  configurator:
-    <<: *erpnext_backend_image
-
-  backend:
-    <<: *erpnext_backend_image
-
-  frontend:
-    image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
-
-  queue-short:
-    <<: *erpnext_backend_image
-
-  queue-default:
-    <<: *erpnext_backend_image
-
-  queue-long:
-    <<: *erpnext_backend_image
-
-  scheduler:
-    <<: *erpnext_backend_image
diff --git a/tests/compose.ci-erpnext.yaml b/tests/compose.ci-erpnext.yaml
deleted file mode 100644
index c767b9da..00000000
--- a/tests/compose.ci-erpnext.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-services:
-  configurator:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  backend:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  frontend:
-    image: localhost:5000/frappe/erpnext-nginx:${ERPNEXT_VERSION}
-
-  websocket:
-    image: localhost:5000/frappe/frappe-socketio:${FRAPPE_VERSION}
-
-  queue-short:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  queue-default:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  queue-long:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  scheduler:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
diff --git a/tests/utils.py b/tests/utils.py
index f42aa891..fc12198b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -28,8 +28,6 @@ class Compose:
             "-f",
             "compose.yaml",
             "-f",
-            "overrides/compose.erpnext.yaml",
-            "-f",
             "overrides/compose.proxy.yaml",
             "-f",
             "overrides/compose.mariadb.yaml",