diff --git a/infra/recipe_modules/crosvm/api.py b/infra/recipe_modules/crosvm/api.py index 421796878d..41606fef28 100644 --- a/infra/recipe_modules/crosvm/api.py +++ b/infra/recipe_modules/crosvm/api.py @@ -268,6 +268,14 @@ class CrosvmApi(recipe_api.RecipeApi): "--stop", ], ) + self.m.step( + "Force pull dev_container", + [ + "vpython3", + self.source_dir.join("tools/dev_container"), + "--pull", + ], + ) self.m.crosvm.step_in_container("Ensure dev container exists", ["true"]) def __set_git_config(self, prop, value): diff --git a/infra/recipe_modules/crosvm/examples/container_build_context.expected/basic.json b/infra/recipe_modules/crosvm/examples/container_build_context.expected/basic.json index d30abb3d20..5475efff78 100644 --- a/infra/recipe_modules/crosvm/examples/container_build_context.expected/basic.json +++ b/infra/recipe_modules/crosvm/examples/container_build_context.expected/basic.json @@ -233,6 +233,19 @@ "@@@STEP_NEST_LEVEL@2@@@" ] }, + { + "cmd": [ + "vpython3", + "[CACHE]/builder/crosvm/tools/dev_container", + "--pull" + ], + "cwd": "[CACHE]/builder/crosvm", + "infra_step": true, + "name": "Prepare Container Build.Prepare dev_container.Force pull dev_container", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@2@@@" + ] + }, { "cmd": [ "vpython3", diff --git a/infra/recipes/build_linux.expected/build_x86_64_coverage.json b/infra/recipes/build_linux.expected/build_x86_64_coverage.json index 7d49e6b5ed..9baf32cc8a 100644 --- a/infra/recipes/build_linux.expected/build_x86_64_coverage.json +++ b/infra/recipes/build_linux.expected/build_x86_64_coverage.json @@ -355,6 +355,31 @@ "@@@STEP_NEST_LEVEL@2@@@" ] }, + { + "cmd": [ + "vpython3", + "[CACHE]/builder/crosvm/tools/dev_container", + "--pull" + ], + "cwd": "[CACHE]/builder/crosvm", + "infra_step": true, + "luci_context": { + "realm": { + "name": "crosvm/crosvm:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, + "name": "Prepare Container Build.Prepare dev_container.Force pull dev_container", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@2@@@" + ] + }, { "cmd": [ "vpython3",