From dc44b9fb6fd8f8197ac37850af6144161b5f2ff2 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Thu, 27 Feb 2025 02:02:05 -0300
Subject: [PATCH] Enable pgconfig acceptance tests CI job

---
 .github/workflows/pull-request.yaml |  4 +--
 Makefile                            |  2 --
 acceptance_tests/entrypoint.py      |  1 -
 compose/acceptance-pgconfig.yml     |  7 +++++
 compose/acceptance.yml              | 48 ++++++++++++++++++++++++-----
 compose/acceptance_pgconfig         |  1 +
 6 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 compose/acceptance-pgconfig.yml

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
index 957e9503..ec91171e 100644
--- a/.github/workflows/pull-request.yaml
+++ b/.github/workflows/pull-request.yaml
@@ -60,7 +60,7 @@ jobs:
         compression-level: 0 # no compression
 
   acceptance:
-    name: Acceptance Tests
+    name: Acceptance
     if: github.repository == 'geoserver/geoserver-cloud'
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        catalog: [ 'datadir' ]
+        catalog: [ 'datadir', 'pgconfig' ]
         #catalog: [ 'datadir', 'pgconfig', 'jdbcconfig' ]
     steps:
     - name: Checkout
diff --git a/Makefile b/Makefile
index b2e5c637..183b857f 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,6 @@ clean-acceptance-tests-datadir:
 
 .PHONY: acceptance-tests-pgconfig
 acceptance-tests-pgconfig: build-acceptance start-acceptance-tests-pgconfig run-acceptance-tests-pgconfig
-	(cd compose/ && ./acceptance_pgconfig up -d)
-	(cd compose/ && ./acceptance_pgconfig exec -T acceptance bash -c 'until [ -f /tmp/healthcheck ]; do echo "Waiting for /tmp/healthcheck to be available..."; sleep 5; done && pytest . -vvv --color=yes')
 
 .PHONY: start-acceptance-tests-pgconfig
 start-acceptance-tests-pgconfig:
diff --git a/acceptance_tests/entrypoint.py b/acceptance_tests/entrypoint.py
index 69bf9c70..5ac6d71c 100755
--- a/acceptance_tests/entrypoint.py
+++ b/acceptance_tests/entrypoint.py
@@ -29,7 +29,6 @@ def timeout():
 endpoints = [
     f"{GEOSERVER_URL}/wms?SERVICE=WMS&REQUEST=GetCapabilities",
     f"{GEOSERVER_URL}/wfs?SERVICE=WFS&REQUEST=GetCapabilities",
-    f"{GEOSERVER_URL}/wcs?SERVICE=WCS&REQUEST=GetCapabilities",
     f"{GEOSERVER_URL}/ows?SERVICE=WMS&REQUEST=GetCapabilities",
     f"{GEOSERVER_URL}/gwc",
     f"{GEOSERVER_URL}/rest",
diff --git a/compose/acceptance-pgconfig.yml b/compose/acceptance-pgconfig.yml
new file mode 100644
index 00000000..460d24fe
--- /dev/null
+++ b/compose/acceptance-pgconfig.yml
@@ -0,0 +1,7 @@
+services:
+  pgconfigdb:
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512M
diff --git a/compose/acceptance.yml b/compose/acceptance.yml
index 4d99a950..e90dc975 100644
--- a/compose/acceptance.yml
+++ b/compose/acceptance.yml
@@ -27,25 +27,30 @@ services:
     depends_on:
       geodatabase:
         condition: service_healthy
+      postgis:
+        condition: service_healthy
       gateway:
         condition: service_healthy
       discovery:
         condition: service_healthy
       config:
         condition: service_healthy
+      acl:
+        condition: service_started
       wms:
         condition: service_healthy
-      # TODO: add wcs and wps
       wfs:
         condition: service_healthy
       gwc:
         condition: service_healthy
-      webui:
-        condition: service_started
       rest:
         condition: service_healthy
-      acl:
-        condition: service_started
+      #webui:
+      #  condition: service_started
+      #wps:
+      #  condition: service_started
+      #wcs:
+      #  condition: service_healthy
     deploy:
       mode: replicated
       replicas: 0
@@ -55,6 +60,18 @@ services:
           memory: 512M
 
   # For github CI
+  rabbitmq:
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512M
+  postgis:
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 256M
   acl:
     deploy:
       resources:
@@ -113,13 +130,28 @@ services:
       retries: 20
   webui:
     deploy:
+      replicas: 0
       resources:
         limits:
           cpus: "1.0"
           memory: 512M
-  rabbitmq:
+  wps:
+    deploy:
+      replicas: 0
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512M
+  wcs:
+    deploy:
+      replicas: 0
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 512M
+  acldb:
     deploy:
       resources:
         limits:
-          cpus: "1.0"
-          memory: 512M
+          cpus: "0.5"
+          memory: 256M
diff --git a/compose/acceptance_pgconfig b/compose/acceptance_pgconfig
index b7b09dcd..a13e1897 100755
--- a/compose/acceptance_pgconfig
+++ b/compose/acceptance_pgconfig
@@ -4,4 +4,5 @@ COMPOSE_PROJECT_NAME=gscloud-acceptance-pgconfig \
 docker compose \
 -f compose.yml \
 -f catalog-pgconfig.yml \
+-f acceptance-pgconfig.yml \
 -f acceptance.yml "$@"