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

1 files changed, 2 insertions, 7 deletions

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"