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 13:07:30 +0100 |
| commit | 5df94c7317796681d3ac4954831a864cbfb74ea0 (patch) | |
| tree | 305e8e148d9cdced651132658abbf7bbcd0d587b | |
| parent | 87999583c18ec367444e4c0aa7c1deeb04ab07d6 (diff) | |
| download | buildstream-5df94c7317796681d3ac4954831a864cbfb74ea0.tar.gz | |
.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.
| -rw-r--r-- | .gitlab-ci/buildgrid-compose.yml | 9 | ||||
| -rw-r--r-- | tests/remoteexecution/workspace.py | 9 |
2 files changed, 4 insertions, 14 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 diff --git a/tests/remoteexecution/workspace.py b/tests/remoteexecution/workspace.py index 3bf35a738..627ae312f 100644 --- a/tests/remoteexecution/workspace.py +++ b/tests/remoteexecution/workspace.py @@ -184,17 +184,12 @@ def get_timemark(cli, project, element_name, marker): @pytest.mark.datafiles(DATA_DIR) +@pytest.mark.xfail(reason="incremental workspace builds are not yet supported") @pytest.mark.parametrize( "modification", [pytest.param("content"), pytest.param("time"),], ) @pytest.mark.parametrize( - "buildtype", - [ - pytest.param("non-incremental"), - pytest.param( - "incremental", marks=pytest.mark.xfail(reason="incremental workspace builds are not yet supported") - ), - ], + "buildtype", [pytest.param("non-incremental"), pytest.param("incremental"),], ) def test_workspace_build(cli, tmpdir, datafiles, modification, buildtype): incremental = buildtype == "incremental" |