From 5a38d8da29fb4f3504af65f9754dee0af967c606 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 28 Dec 2022 12:29:56 +0530
Subject: [PATCH] ci: skip frappe builds

---
 compose.yaml                   |  4 ++--
 docker-bake.hcl                |  8 ++------
 overrides/compose.erpnext.yaml | 27 ---------------------------
 tests/compose.ci-erpnext.yaml  | 24 ------------------------
 tests/compose.ci.yaml          | 14 +++++++-------
 tests/conftest.py              |  6 +-----
 6 files changed, 12 insertions(+), 71 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..6725787d 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 ERPNext version set}
   volumes:
     - sites:/home/frappe/frappe-bench/sites
     - assets:/home/frappe/frappe-bench/sites/assets:ro
@@ -27,7 +27,7 @@ services:
     <<: *backend_defaults
 
   frontend:
-    image: frappe/frappe-nginx:${FRAPPE_VERSION}
+    image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
     environment:
       BACKEND: backend:8000
       SOCKETIO: websocket:9000
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 72eb9d9a..d72b7caa 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -44,16 +44,12 @@ target "bench-test" {
 # Main images
 # Base for all other targets
 
-group "frappe" {
-    targets = ["frappe-worker", "frappe-nginx", "frappe-socketio"]
-}
-
 group "erpnext" {
-    targets = ["erpnext-worker", "erpnext-nginx"]
+    targets = ["erpnext-worker", "erpnext-nginx", "frappe-socketio"]
 }
 
 group "default" {
-    targets = ["frappe", "erpnext"]
+    targets = ["erpnext"]
 }
 
 function "tag" {
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/compose.ci.yaml b/tests/compose.ci.yaml
index c7e168f9..c767b9da 100644
--- a/tests/compose.ci.yaml
+++ b/tests/compose.ci.yaml
@@ -1,24 +1,24 @@
 services:
   configurator:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
 
   backend:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
 
   frontend:
-    image: localhost:5000/frappe/frappe-nginx:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-nginx:${ERPNEXT_VERSION}
 
   websocket:
     image: localhost:5000/frappe/frappe-socketio:${FRAPPE_VERSION}
 
   queue-short:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
 
   queue-default:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
 
   queue-long:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
 
   scheduler:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
diff --git a/tests/conftest.py b/tests/conftest.py
index f9885dd1..6185eabc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -68,11 +68,7 @@ def frappe_site(compose: Compose):
 @pytest.fixture(scope="class")
 def erpnext_setup(compose: Compose):
     compose.stop()
-
-    args = ["-f", "overrides/compose.erpnext.yaml"]
-    if CI:
-        args += ("-f", "tests/compose.ci-erpnext.yaml")
-    compose(*args, "up", "-d", "--quiet-pull")
+    compose("up", "-d", "--quiet-pull")
 
     yield
     compose.stop()