From c2c8b2361243866cf4dc76cc80c5f9607f620706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Wed, 5 Nov 2025 11:11:52 +0100
Subject: [PATCH 1/2] .github/compose/ci.buildgrid.yml: Remove unused storage
 service

BuildGrid itself doesn't offer a Remote Asset service and CI is
currently only testing remote execution with BuildGrid.
---
 .github/compose/ci.buildgrid.yml      | 14 --------------
 .github/compose/ci.docker-compose.yml |  2 --
 2 files changed, 16 deletions(-)

diff --git a/.github/compose/ci.buildgrid.yml b/.github/compose/ci.buildgrid.yml
index 0b37e9fe3..6ef8d422f 100644
--- a/.github/compose/ci.buildgrid.yml
+++ b/.github/compose/ci.buildgrid.yml
@@ -3,13 +3,9 @@
 #
 # Spins-up a unnamed and unauthenticated grid:
 #  - Controller + CAS + AC at http://localhost:50051
-#  - Ref. + CAS at: http://localhost:50052
 #
 # BuildStream configuration snippet:
 #
-#    artifacts:
-#      url: http://localhost:50052
-#      push: true
 #    remote-execution:
 #      execution-service:
 #        url: http://localhost:50051
@@ -49,16 +45,6 @@ services:
     networks:
       - grid
 
-  storage:
-    image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildgrid:nightly
-    command: [
-      "bgd", "server", "start", "-v",
-      "/etc/buildgrid/artifacts.yml"]
-    ports:
-      - 50052:50052
-    networks:
-      - grid
-
 networks:
   grid:
     driver: bridge
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index e9797bd58..a94845f19 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -58,9 +58,7 @@ services:
     command: tox -vvvvv -- --color=yes --remote-execution
     environment:
       TOXENV: ${CI_TOXENV_MAIN}
-      ARTIFACT_CACHE_SERVICE: http://localhost:50052
       REMOTE_EXECUTION_SERVICE: http://localhost:50051
-      SOURCE_CACHE_SERVICE: http://localhost:50052
 
     # We need to use host networking mode in order to be able to
     # properly resolve services exposed by adjacent containers.

From e5fc2f5c166600c5f30a8e3c49e3290d6a7c2d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Wed, 5 Nov 2025 11:38:35 +0100
Subject: [PATCH 2/2] .github/compose/ci.buildgrid.yml: Switch to PostgreSQL

SQLite support is deprecated in BuildGrid and the default configuration
now requires PostgreSQL instead.
---
 .github/compose/ci.buildgrid.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/compose/ci.buildgrid.yml b/.github/compose/ci.buildgrid.yml
index 6ef8d422f..64aa328e2 100644
--- a/.github/compose/ci.buildgrid.yml
+++ b/.github/compose/ci.buildgrid.yml
@@ -21,6 +21,26 @@
 version: "3.2"
 
 services:
+  database:
+    image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildgrid-postgres:nightly
+    environment:
+      POSTGRES_USER: bgd
+      POSTGRES_PASSWORD: insecure
+      POSTGRES_DB: bgd
+    volumes:
+      - type: volume
+        source: db
+        target: /var/lib/postgresql
+    networks:
+      - grid
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "bgd"]
+      interval: 1s
+      timeout: 5s
+      retries: 10
+
   controller:
     image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildgrid:nightly
     command: [
@@ -30,6 +50,9 @@ services:
       - 50051:50051
     networks:
       - grid
+    depends_on:
+      database:
+        condition: service_healthy
 
   bot:
     image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildbox:nightly
@@ -51,3 +74,4 @@ networks:
 
 volumes:
   cache:
+  db: