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.

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

Revert "Pass test flags to bazel-diff (#1608)" #1609

Merged
merged 1 commit into from
May 2, 2023
Merged

Revert "Pass test flags to bazel-diff (#1608)" #1609

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
35 changes: 9 additions & 26 deletions buildkite/bazelci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,18 +1319,8 @@ def execute_commands(
if not git_commit:
raise BuildkiteInfraException("Unable to determine Git commit for this build")

test_flags, json_profile_out_test, capture_corrupted_outputs_dir_test = calculate_flags(
task_config, "test_flags", "test", tmpdir, test_env_vars
)

build_targets, test_targets, coverage_targets, index_targets = calculate_targets(
task_config,
bazel_binary,
build_only,
test_only,
requested_working_dir,
git_commit,
test_flags,
task_config, bazel_binary, build_only, test_only, requested_working_dir, git_commit
)

if build_targets:
Expand Down Expand Up @@ -1363,6 +1353,9 @@ def execute_commands(
upload_corrupted_outputs(capture_corrupted_outputs_dir_build, tmpdir)

if test_targets:
test_flags, json_profile_out_test, capture_corrupted_outputs_dir_test = calculate_flags(
task_config, "test_flags", "test", tmpdir, test_env_vars
)
if not is_windows():
# On platforms that support sandboxing (Linux, MacOS) we have
# to allow access to Bazelisk's cache directory.
Expand Down Expand Up @@ -2080,9 +2073,7 @@ def execute_bazel_build_with_kythe(bazel_version, bazel_binary, platform, flags,
)


def calculate_targets(
task_config, bazel_binary, build_only, test_only, workspace_dir, git_commit, test_flags
):
def calculate_targets(task_config, bazel_binary, build_only, test_only, workspace_dir, git_commit):
build_targets = [] if test_only else task_config.get("build_targets", [])
test_targets = [] if build_only else task_config.get("test_targets", [])
coverage_targets = [] if (build_only or test_only) else task_config.get("coverage_targets", [])
Expand Down Expand Up @@ -2112,7 +2103,7 @@ def calculate_targets(
diffbase = os.getenv(USE_BAZEL_DIFF_ENV_VAR, "").lower()
actual_test_targets = (
filter_unchanged_targets(
expanded_test_targets, workspace_dir, bazel_binary, diffbase, git_commit, test_flags
expanded_test_targets, workspace_dir, bazel_binary, diffbase, git_commit
)
if diffbase
else expanded_test_targets
Expand Down Expand Up @@ -2163,7 +2154,7 @@ def expand_test_target_patterns(bazel_binary, test_targets):


def filter_unchanged_targets(
expanded_test_targets, workspace_dir, bazel_binary, diffbase, git_commit, test_flags
expanded_test_targets, workspace_dir, bazel_binary, diffbase, git_commit
):
print_collapsed_group(
f":scissors: Filtering targets that haven't been affected since {diffbase}"
Expand All @@ -2177,13 +2168,7 @@ def filter_unchanged_targets(
eprint(f"Running bazel-diff for {resolved_diffbase} and {git_commit}")
try:
affected_targets = run_bazel_diff(
bazel_diff_path,
workspace_dir,
bazel_binary,
resolved_diffbase,
git_commit,
test_flags,
tmpdir,
bazel_diff_path, workspace_dir, bazel_binary, resolved_diffbase, git_commit, tmpdir
)
finally:
shutil.rmtree(tmpdir)
Expand Down Expand Up @@ -2228,7 +2213,7 @@ def download_bazel_diff(directory):


def run_bazel_diff(
bazel_diff_path, workspace_dir, bazel_binary, start_commit, end_commit, test_flags, data_dir
bazel_diff_path, workspace_dir, bazel_binary, start_commit, end_commit, data_dir
):
before_json = os.path.join(data_dir, "before.json")
after_json = os.path.join(data_dir, "after.json")
Expand Down Expand Up @@ -2259,8 +2244,6 @@ def run_bazel_diff(
workspace_dir,
"-b",
bazel_binary,
"-co",
" ".join(test_flags),
json_path,
]
)
Expand Down