Skip to content
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.

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

ci: Trim unnecessary builds #24069

Merged
merged 1 commit into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions ci/mkpipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from materialize.ci_util.trim_pipeline import permit_rerunning_successful_steps
from materialize.mzcompose.composition import Composition
from materialize.ui import UIError
from materialize.xcompile import Arch

from .deploy.deploy_util import rust_version

Expand Down Expand Up @@ -137,6 +138,8 @@ def visit(step: dict[str, Any]) -> None:

check_depends_on(pipeline, args.pipeline)

trim_builds(pipeline, args.coverage)

# Remove the Materialize-specific keys from the configuration that are
# only used to inform how to trim the pipeline and for coverage runs.
def visit(step: dict[str, Any]) -> None:
Expand Down Expand Up @@ -390,6 +393,34 @@ def visit(step: PipelineStep) -> None:
]


def trim_builds(pipeline: Any, coverage: bool) -> None:
"""Trim unnecessary x86-64/aarch64 builds if all artifacts already exist."""

def builds_published(arch: Arch) -> bool:
repo = mzbuild.Repository(Path("."), arch=arch, coverage=coverage)
deps_publish = repo.resolve_dependencies(
image for image in repo if image.publish
)
return deps_publish.check()

def visit(step: dict[str, Any]) -> None:
if step.get("id") == "build-x86_64":
if builds_published(Arch.X86_64):
step["skip"] = True
if step.get("id") == "build-aarch64":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not necessary here to include the command as done in other places (ident = step.get("id") or step.get("command"))? If so, when is that necessary? @def-

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the id is build-* in our actual pipelines, we don't have any commands with that name, the command would be something like bin/ci-builder run stable bin/pyactivate -m ci.test.build

branch = os.environ["BUILDKITE_BRANCH"]
if (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are the checks for the two architectures asymmetrical?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already don't run build-aarch64 for PRs, only on main and v*.* branches.

branch == "main" or branch.startswith("v") and "." in branch
) and builds_published(Arch.AARCH64):
step["skip"] = True

for step in pipeline["steps"]:
visit(step)
if "group" in step:
for inner_step in step.get("steps", []):
visit(inner_step)


def have_paths_changed(globs: Iterable[str]) -> bool:
"""Reports whether the specified globs have diverged from origin/main."""
diff = subprocess.run(
Expand Down
5 changes: 5 additions & 0 deletions misc/python/materialize/mzbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,11 @@ def ensure(self, post_build: Callable[[ResolvedImage], None] | None = None):
if returncode:
raise subprocess.CalledProcessError(returncode, push.args)

def check(self) -> bool:
"""Check all publishable images in this dependency set exist on Docker
Hub. Don't try to download or build them."""
return all(dep.is_published_if_necessary() for dep in self)

def __iter__(self) -> Iterator[ResolvedImage]:
return iter(self._dependencies.values())

Expand Down