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 2021/06/07 14:26:19 UTC
[buildstream] 01/01: _sandboxbuildboxrun.py: Drop --use-localcas
This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a commit to branch juerg/buildbox-use-localcas
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit dbbd2f4d4824990fb7ad80f14d75ce965b17273f
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Mon Jun 7 16:01:50 2021 +0200
_sandboxbuildboxrun.py: Drop --use-localcas
This option has been deprecated in BuildBox upstream for a year and will
be removed.
---
.github/compose/ci.buildgrid.yml | 2 +-
src/buildstream/sandbox/_sandboxbuildboxrun.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/compose/ci.buildgrid.yml b/.github/compose/ci.buildgrid.yml
index 211c320..0b37e9f 100644
--- a/.github/compose/ci.buildgrid.yml
+++ b/.github/compose/ci.buildgrid.yml
@@ -38,7 +38,7 @@ services:
bot:
image: registry.gitlab.com/buildgrid/buildgrid.hub.docker.com/buildbox:nightly
command: [
- "sh", "-c", "sleep 15 && ( buildbox-casd --cas-remote=http://controller:50051 /var/lib/buildgrid/cache & buildbox-worker --request-timeout=30 --bots-remote=http://controller:50051 --cas-remote=unix:/var/lib/buildgrid/cache/casd.sock --buildbox-run=buildbox-run-bubblewrap --runner-arg=--use-localcas --platform OSFamily=linux --platform ISA=x86-64 --verbose )"]
+ "sh", "-c", "sleep 15 && ( buildbox-casd --cas-remote=http://controller:50051 /var/lib/buildgrid/cache & buildbox-worker --request-timeout=30 --bots-remote=http://controller:50051 --cas-remote=unix:/var/lib/buildgrid/cache/casd.sock --buildbox-run=buildbox-run-bubblewrap --platform OSFamily=linux --platform ISA=x86-64 --verbose )"]
privileged: true
volumes:
- type: volume
diff --git a/src/buildstream/sandbox/_sandboxbuildboxrun.py b/src/buildstream/sandbox/_sandboxbuildboxrun.py
index e489c9b..9880875 100644
--- a/src/buildstream/sandbox/_sandboxbuildboxrun.py
+++ b/src/buildstream/sandbox/_sandboxbuildboxrun.py
@@ -94,7 +94,6 @@ class SandboxBuildBoxRun(SandboxREAPI):
buildbox_command = [
utils.get_host_tool("buildbox-run"),
- "--use-localcas",
"--remote={}".format(casd_process_manager._connection_string),
"--action={}".format(action_file.name),
"--action-result={}".format(result_file.name),