diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-02-06 17:19:10 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-02-11 12:03:19 +0100 |
| commit | 2f51dd42c4ca12890af59a1d35c8109fbbaae498 (patch) | |
| tree | 6e21f23766a073cbbe66b849a48f4842863787fc | |
| parent | 87999583c18ec367444e4c0aa7c1deeb04ab07d6 (diff) | |
| download | buildstream-juerg/ci-re.tar.gz | |
.gitlab-ci/buildgrid-compose.yml: Switch to buildbox-workerjuerg/ci-re
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.
| -rw-r--r-- | .gitlab-ci/buildgrid-compose.yml | 9 |
1 files changed, 2 insertions, 7 deletions
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 |