From 5df94c7317796681d3ac4954831a864cbfb74ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 6 Feb 2020 17:19:10 +0100 Subject: .gitlab-ci/buildgrid-compose.yml: Switch to buildbox-worker Use buildbox-worker with buildbox-run-bubblewrap and buildbox-fuse from the buildbox-nightly docker image instead of the Python buildbox worker as the latter still uses the obsolete `buildbox` command. buildbox-worker launch is delayed as it fails if started before the BuildGrid server is ready. --- .gitlab-ci/buildgrid-compose.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to '.gitlab-ci') diff --git a/.gitlab-ci/buildgrid-compose.yml b/.gitlab-ci/buildgrid-compose.yml index 95b98f792..2d2725706 100644 --- a/.gitlab-ci/buildgrid-compose.yml +++ b/.gitlab-ci/buildgrid-compose.yml @@ -36,14 +36,9 @@ services: - grid bot: - image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildgrid:nightly + image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildbox:nightly command: [ - "bgd", "bot", "--parent=", "-v", - "--remote=http://controller:50051", - "--remote-cas=http://controller:50051", - "buildbox", - "--local-cas", "/var/lib/buildgrid/cache", - "--fuse-dir", "/mnt"] + "sh", "-c", "sleep 15 && ( buildbox-casd --cas-remote=http://controller:50051 /var/lib/buildgrid/cache & buildbox-worker --bots-remote=http://controller:50051 --cas-remote=unix:/var/lib/buildgrid/cache/casd.sock --buildbox-run=buildbox-run-bubblewrap --runner-arg=--use-localcas --verbose )"] privileged: true volumes: - type: volume -- cgit v1.2.1