mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 10:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

infra: Optimize cache usage among builders

Browse source 
Then 'builder' cache dir is set up by default to be a cache directory
for each builder, so luci will try to schedule a builder to run on
the same bot as before.
We can optimize that by sharing the cache among all linux builders.

BUG=b:238333690
TEST=lucicfg validate main.star

Change-Id: If4639658271881f1bf1ad001ae54f50645e8890a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3751828
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Dennis Kempin 2022-07-07 18:43:32 +00:00
parent 909f10fef5
commit b1abe58649
13 changed files with 155 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
infra/README.recipes.md
View file

@ -27,9 +27,11 @@ PYTHON_VERSION_COMPATIBILITY: PY3
Crosvm specific functionality shared between recipes.
&emsp; **@property**<br>&mdash; **def [builder\_dir](/infra/recipe_modules/crosvm/api.py#47)(self):**
&emsp; **@property**<br>&mdash; **def [builder\_cache](/infra/recipe_modules/crosvm/api.py#43)(self):**
&emsp; **@property**<br>&mdash; **def [cache\_dir](/infra/recipe_modules/crosvm/api.py#43)(self):**
Dedicated cache directory for each builder.
Luci will try to run each builder on the same bot as previously to keep this cache present.
&emsp; **@property**<br>&mdash; **def [cargo\_home](/infra/recipe_modules/crosvm/api.py#24)(self):**
@ -39,7 +41,7 @@ CARGO_HOME is cached between runs.
CARGO_TARGET_DIR is cleaned up between runs
&mdash; **def [container\_build\_context](/infra/recipe_modules/crosvm/api.py#61)(self):**
&mdash; **def [container\_build\_context](/infra/recipe_modules/crosvm/api.py#62)(self):**
Prepares source and system to build crosvm via dev container.
@ -49,7 +51,7 @@ Usage:
&emsp; **@property**<br>&mdash; **def [dev\_container\_cache](/infra/recipe_modules/crosvm/api.py#39)(self):**
&mdash; **def [host\_build\_context](/infra/recipe_modules/crosvm/api.py#78)(self):**
&mdash; **def [host\_build\_context](/infra/recipe_modules/crosvm/api.py#79)(self):**
Prepares source and system to build crosvm directly on the host.
@ -64,13 +66,13 @@ Usage:
Directory used to install local tools required by the build.
&mdash; **def [prepare\_git](/infra/recipe_modules/crosvm/api.py#123)(self):**
&mdash; **def [prepare\_git](/infra/recipe_modules/crosvm/api.py#124)(self):**
&emsp; **@property**<br>&mdash; **def [rustup\_home](/infra/recipe_modules/crosvm/api.py#19)(self):**
RUSTUP_HOME is cached between runs.
&mdash; **def [source\_context](/infra/recipe_modules/crosvm/api.py#51)(self):**
&mdash; **def [source\_context](/infra/recipe_modules/crosvm/api.py#52)(self):**
Updates the source to the revision to be tested and drops into the source directory.
@ -80,7 +82,7 @@ Use when no build commands are needed.
Where the crosvm source will be checked out.
&mdash; **def [step\_in\_container](/infra/recipe_modules/crosvm/api.py#109)(self, step_name, command):**
&mdash; **def [step\_in\_container](/infra/recipe_modules/crosvm/api.py#110)(self, step_name, command):**
Runs a luci step inside the crosvm dev container.
## Recipes

40
infra/config/generated/cr-buildbucket.cfg
View file

@ -51,6 +51,10 @@ buckets {
'{'
' "recipe": "health_check"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -74,6 +78,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "aarch64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -97,6 +105,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "armhf"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -120,6 +132,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "x86_64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -143,6 +159,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "x86_64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -241,6 +261,10 @@ buckets {
'{'
' "recipe": "health_check"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -264,6 +288,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "aarch64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -287,6 +315,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "armhf"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -310,6 +342,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "x86_64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
@ -333,6 +369,10 @@ buckets {
' "recipe": "build_linux",'
' "test_arch": "x86_64"'
'}'
caches {
name: "linux_builder_cache"
path: "builder"
}
service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"

6
infra/config/main.star
View file

@ -230,6 +230,9 @@ def verify_linux_builder(arch, crosvm_direct = False, **kwargs):
"test_arch": arch,
"crosvm_direct": crosvm_direct,
},
caches = [
swarming.cache("builder", name = "linux_builder_cache"),
],
category = "linux",
**kwargs
)
@ -320,6 +323,9 @@ verify_builder(
executable = luci.recipe(
name = "health_check",
),
caches = [
swarming.cache("builder", name = "linux_builder_cache"),
],
category = "linux",
)

23
infra/recipe_modules/crosvm/api.py
View file

@ -14,17 +14,17 @@ class CrosvmApi(recipe_api.RecipeApi):
@property
def source_dir(self):
"Where the crosvm source will be checked out."
return self.builder_dir.join("crosvm")
return self.builder_cache.join("crosvm")
@property
def rustup_home(self):
"RUSTUP_HOME is cached between runs."
return self.cache_dir.join("rustup")
return self.builder_cache.join("rustup")
@property
def cargo_home(self):
"CARGO_HOME is cached between runs."
return self.cache_dir.join("cargo_home")
return self.builder_cache.join("cargo_home")
@property
def cargo_target_dir(self):
@ -34,18 +34,19 @@ class CrosvmApi(recipe_api.RecipeApi):
@property
def local_bin(self):
"Directory used to install local tools required by the build."
return self.cache_dir.join("local_bin")
return self.builder_cache.join("local_bin")
@property
def dev_container_cache(self):
return self.cache_dir.join("dev_container")
return self.builder_cache.join("dev_container")
@property
def cache_dir(self):
return self.m.path["cache"].join("crosvm_api")
def builder_cache(self):
"""
Dedicated cache directory for each builder.
@property
def builder_dir(self):
Luci will try to run each builder on the same bot as previously to keep this cache present.
"""
return self.m.path["cache"].join("builder")
def source_context(self):
@ -180,8 +181,8 @@ class CrosvmApi(recipe_api.RecipeApi):
"""
self.prepare_git()
with self.m.step.nest("Prepare source"):
self.m.file.ensure_directory("Ensure builder_dir exists", self.builder_dir)
with self.m.context(cwd=self.builder_dir):
self.m.file.ensure_directory("Ensure builder_cache exists", self.builder_cache)
with self.m.context(cwd=self.builder_cache):
gclient_config = self.m.gclient.make_config()
s = gclient_config.solutions.add()
s.url = CROSVM_REPO_URL

4
infra/recipe_modules/crosvm/examples/container_build_context.expected/basic.json
View file

@ -98,7 +98,7 @@
"[CACHE]/builder"
],
"infra_step": true,
"name": "Prepare Container Build.Prepare source.Ensure builder_dir exists",
"name": "Prepare Container Build.Prepare source.Ensure builder_cache exists",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@ -249,7 +249,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"name": "Build"
},

62
infra/recipe_modules/crosvm/examples/host_build_context.expected/basic_linux.json
View file

@ -98,7 +98,7 @@
"[CACHE]/builder"
],
"infra_step": true,
"name": "Prepare Host Build.Prepare source.Ensure builder_dir exists",
"name": "Prepare Host Build.Prepare source.Ensure builder_cache exists",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@ -232,14 +232,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -263,14 +263,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -299,14 +299,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -322,14 +322,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -355,18 +355,18 @@
"ensure-directory",
"--mode",
"0777",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/local_bin"
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -380,7 +380,7 @@
"cipd",
"ensure",
"-root",
"[CACHE]/crosvm_api/local_bin",
"[CACHE]/builder/local_bin",
"-ensure-file",
"crosvm/protoc/${platform} latest",
"-max-threads",
@ -390,14 +390,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"infra_step": true,
@ -424,14 +424,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"name": "Build"

70
infra/recipe_modules/crosvm/examples/host_build_context.expected/basic_windows.json
View file

@ -84,7 +84,7 @@
"[CACHE]\\builder"
],
"infra_step": true,
"name": "Prepare Host Build.Prepare source.Ensure builder_dir exists",
"name": "Prepare Host Build.Prepare source.Ensure builder_cache exists",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@ -218,14 +218,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -249,14 +249,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -285,14 +285,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -310,14 +310,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -333,14 +333,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -366,18 +366,18 @@
"ensure-directory",
"--mode",
"0777",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\local_bin"
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -391,7 +391,7 @@
"cipd.bat",
"ensure",
"-root",
"[CACHE]\\crosvm_api\\local_bin",
"[CACHE]\\builder\\local_bin",
"-ensure-file",
"crosvm/protoc/${platform} latest",
"-max-threads",
@ -401,14 +401,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"infra_step": true,
@ -435,14 +435,14 @@
],
"cwd": "[CACHE]\\builder\\crosvm",
"env": {
"CARGO_HOME": "[CACHE]\\crosvm_api\\cargo_home",
"CARGO_HOME": "[CACHE]\\builder\\cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]\\cargo_target",
"RUSTUP_HOME": "[CACHE]\\crosvm_api\\rustup"
"RUSTUP_HOME": "[CACHE]\\builder\\rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]\\crosvm_api\\cargo_home\\bin",
"[CACHE]\\crosvm_api\\local_bin"
"[CACHE]\\builder\\cargo_home\\bin",
"[CACHE]\\builder\\local_bin"
]
},
"name": "Build"

4
infra/recipes/build_linux.expected/build_aarch64.json
View file

@ -11,7 +11,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -38,7 +38,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {

4
infra/recipes/build_linux.expected/build_armhf.json
View file

@ -12,7 +12,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -40,7 +40,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {

4
infra/recipes/build_linux.expected/build_x86_64.json
View file

@ -11,7 +11,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -38,7 +38,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {

4
infra/recipes/build_linux.expected/build_x86_64_direct.json
View file

@ -12,7 +12,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -40,7 +40,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {

16
infra/recipes/build_windows.expected/build.json
View file

@ -9,14 +9,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"luci_context": {
@ -41,14 +41,14 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CARGO_HOME": "[CACHE]/crosvm_api/cargo_home",
"CARGO_HOME": "[CACHE]/builder/cargo_home",
"CARGO_TARGET_DIR": "[CLEANUP]/cargo_target",
"RUSTUP_HOME": "[CACHE]/crosvm_api/rustup"
"RUSTUP_HOME": "[CACHE]/builder/rustup"
},
"env_prefixes": {
"PATH": [
"[CACHE]/crosvm_api/cargo_home/bin",
"[CACHE]/crosvm_api/local_bin"
"[CACHE]/builder/cargo_home/bin",
"[CACHE]/builder/local_bin"
]
},
"luci_context": {

8
infra/recipes/health_check.expected/basic.json
View file

@ -9,7 +9,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -35,7 +35,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -61,7 +61,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {
@ -87,7 +87,7 @@
],
"cwd": "[CACHE]/builder/crosvm",
"env": {
"CROSVM_CONTAINER_CACHE": "[CACHE]/crosvm_api/dev_container"
"CROSVM_CONTAINER_CACHE": "[CACHE]/builder/dev_container"
},
"luci_context": {
"realm": {