You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ju...@apache.org on 2025/11/05 10:40:28 UTC

(buildstream) branch jbilleter/buildgrid created (now 5f2c3c893)

This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a change to branch jbilleter/buildgrid
in repository https://gitbox.apache.org/repos/asf/buildstream.git


      at 5f2c3c893 .github/compose/ci.buildgrid.yml: Switch to PostgreSQL

This branch includes the following new commits:

     new c2c8b2361 .github/compose/ci.buildgrid.yml: Remove unused storage service
     new 5f2c3c893 .github/compose/ci.buildgrid.yml: Switch to PostgreSQL

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(buildstream) 01/02: .github/compose/ci.buildgrid.yml: Remove unused storage service

Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch jbilleter/buildgrid
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit c2c8b2361243866cf4dc76cc80c5f9607f620706
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Wed Nov 5 11:11:52 2025 +0100

    .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.


(buildstream) 02/02: .github/compose/ci.buildgrid.yml: Switch to PostgreSQL

Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch jbilleter/buildgrid
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 5f2c3c89301737da9d33523967b2bd79c9b23447
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Wed Nov 5 11:38:35 2025 +0100

    .github/compose/ci.buildgrid.yml: Switch to PostgreSQL
    
    SQLite support is being deprecated in BuildGrid.
---
 .github/compose/buildgrid-config/execution.yml | 67 ++++++++++++++++++++++++++
 .github/compose/ci.buildgrid.yml               | 27 ++++++++++-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/.github/compose/buildgrid-config/execution.yml b/.github/compose/buildgrid-config/execution.yml
new file mode 100644
index 000000000..114edc80b
--- /dev/null
+++ b/.github/compose/buildgrid-config/execution.yml
@@ -0,0 +1,67 @@
+server:
+  - !channel
+    address: "[::]:50051"
+    insecure-mode: true
+
+grpc-server-options:
+  grpc.max_connection_age_ms: 300000
+
+description: >
+    - Unauthenticated plain HTTP at :50051
+    - Single instance: [unnamed]
+    - In-memory data, max. 2GB
+    - Hosted services:
+       - ActionCache
+       - Execute
+       - ContentAddressableStorage
+       - ByteStream
+
+authorization:
+  method: none
+
+monitoring:
+  enabled: false
+
+connections:
+  - !sql-connection &sql
+    connection-string: postgresql://bgd:insecure@database/bgd
+    pool-size: 5
+    pool-timeout: 30
+    max-overflow: 10
+
+storages:
+  - !lru-storage &cas-storage
+    size: 2048M
+
+caches:
+  - !lru-action-cache &build-cache
+    storage: *cas-storage
+    max-cached-refs: 256
+    cache-failed-actions: true
+    allow-updates: true
+
+schedulers:
+  - !sql-scheduler &state-database
+    sql: *sql
+    storage: *cas-storage
+    action-cache: *build-cache
+    max-execution-timeout: 7200
+    poll-interval: 0.5
+
+instances:
+  - name: ''
+    description: |
+      The unique '' instance.
+
+    services:
+      - !action-cache
+        cache: *build-cache
+
+      - !execution
+        scheduler: *state-database
+
+      - !cas
+        storage: *cas-storage
+
+      - !bytestream
+        storage: *cas-storage
diff --git a/.github/compose/ci.buildgrid.yml b/.github/compose/ci.buildgrid.yml
index 6ef8d422f..45845e95d 100644
--- a/.github/compose/ci.buildgrid.yml
+++ b/.github/compose/ci.buildgrid.yml
@@ -21,15 +21,39 @@
 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: [
       "bgd", "server", "start", "-v",
-      "/etc/buildgrid/default.yml"]
+      "/etc/buildgrid/execution.yml"]
     ports:
       - 50051:50051
     networks:
       - grid
+    volumes:
+    - type: bind
+      source: ./buildgrid-config/
+      target: /etc/buildgrid
 
   bot:
     image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildbox:nightly
@@ -51,3 +75,4 @@ networks:
 
 volumes:
   cache:
+  db: