Skip to content

Commit

Permalink
Remove MacOS limitations (#1842)
Browse files Browse the repository at this point in the history
The new network infrastructure has been installed, thus resolving the
outage.

Fixes #1800
  • Loading branch information
fweikert authored Dec 20, 2023
1 parent 67fc1d7 commit d646a2d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 35 deletions.
48 changes: 15 additions & 33 deletions buildkite/bazelci.py
Original file line number Diff line number Diff line change
Expand Up @@ -2856,23 +2856,21 @@ def print_project_pipeline(
except ValueError:
raise BuildkiteException("Task {} has invalid shard value '{}'".format(task, shards))

# TODO(https://github.com/bazelbuild/continuous-integration/issues/1800): enable Mac workers for all tasks
if "mac" not in platform or is_high_priority_backlog_task():
step = runner_step(
platform=platform,
task=task,
task_name=task_name,
project_name=project_name,
http_config=http_config,
file_config=file_config,
git_repository=git_repository,
git_commit=git_commit,
monitor_flaky_tests=monitor_flaky_tests,
use_but=use_but,
shards=shards,
soft_fail=soft_fail,
)
pipeline_steps.append(step)
step = runner_step(
platform=platform,
task=task,
task_name=task_name,
project_name=project_name,
http_config=http_config,
file_config=file_config,
git_repository=git_repository,
git_commit=git_commit,
monitor_flaky_tests=monitor_flaky_tests,
use_but=use_but,
shards=shards,
soft_fail=soft_fail,
)
pipeline_steps.append(step)

if skipped_downstream_tasks:
lines = ["\n- {}".format(s) for s in skipped_downstream_tasks]
Expand Down Expand Up @@ -2941,14 +2939,6 @@ def print_project_pipeline(
print_pipeline_steps(pipeline_steps, handle_emergencies=not is_downstream_pipeline())


# TODO(https://github.com/bazelbuild/continuous-integration/issues/1800): Remove once we've processed the backlog of high-priority tasks.
def is_high_priority_backlog_task():
return os.getenv("BUILDKITE_REPO") in (
"https://github.com/bazelbuild/bazel.git",
"https://bazel.googlesource.com/bazel.git",
) and not os.getenv("BUILDKITE_PULL_REQUEST_REPO")


def show_gerrit_review_link(git_repository, pipeline_steps):
host = re.search(r"https://(.+?)\.googlesource", git_repository).group(1)
if not host:
Expand Down Expand Up @@ -3993,14 +3983,6 @@ def main(argv=None):

platform = get_platform_for_task(args.task, task_config)

# TODO(https://github.com/bazelbuild/continuous-integration/issues/1800): Remove once we've processed the backlog of high-priority tasks.
if "mac" in platform and not is_high_priority_backlog_task():
eprint(
"This job is currently blocked since we're still working through "
"our backlog on MacOS after a three-day-outage."
)
return 0

# The value of `BUILDKITE_MESSAGE` defaults to the commit message, which can be too large
# on Windows, therefore we truncate the value to 1000 characters.
# See https://github.com/bazelbuild/continuous-integration/issues/1218
Expand Down
4 changes: 2 additions & 2 deletions buildkite/emergency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
# Please do not clear or delete this file when an incident is over.
# Instead, simply replace all values with empty strings ("").
---
message: "MacOS network issues have been mitigated and all of our Macs are back online. However, due to the huge backlog we've only enabled MacOS for a small number of pipelines. We hope to be able to operate at full capacity again later this week."
issue_url: "https://github.com/bazelbuild/continuous-integration/issues/1800"
message: ""
issue_url: ""
last_good_bazel: ""

0 comments on commit d646a2d

Please sign in to comment.