Skip to content

fix: reset BuildKit cache between retries for base/assembly builds #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonrosenberg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reset BuildKit cache between retries for base/assembly builds #631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions benchmarks/swebench/build_base_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
capture_output,
default_build_output_dir,
)
from benchmarks.utils.buildx_utils import maybe_reset_buildkit
from benchmarks.utils.constants import EVAL_AGENT_SERVER_IMAGE
from benchmarks.utils.image_utils import remote_image_exists
from openhands.sdk import get_logger
Expand Down Expand Up @@ -298,6 +299,7 @@ def _build_base_with_logging(
result.log_path = str(log_path)
if result.error:
logger.error("Base build error for %s: %s", base_image, result.error)
maybe_reset_buildkit(base_image, image, attempt, max_retries)
if attempt == max_retries - 1:
return result
continue
Expand Down Expand Up @@ -673,6 +675,7 @@ def _assemble_with_logging(
result.log_path = str(log_path)
if result.error:
logger.error("Assembly error for %s: %s", base_image, result.error)
maybe_reset_buildkit(base_image, target_image, attempt, max_retries)
if attempt == max_retries - 1:
return result
continue
Expand All @@ -693,6 +696,7 @@ def _assemble_with_logging(
error=f"Wrapping failed: {wrap_result.error}",
log_path=str(log_path),
)
maybe_reset_buildkit(base_image, target_image, attempt, max_retries)
if attempt == max_retries - 1:
return result
continue
Expand Down
Loading