Skip to content

Commit

Permalink
Revert "Disable uploading to GCS through buildkite-agent" (#1825)
Browse files Browse the repository at this point in the history
This didn't help much with the postsubmits.

This reverts commit 7dfa409.
  • Loading branch information
meteorcloudy authored Nov 29, 2023
1 parent 4eb7318 commit 5e8336e
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions buildkite/bazelci.py
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ def activate_xcode(task_config):
# or the requested version is not installed.
if xcode_version not in supported_versions:
xcode_version = supported_versions[0]

if not wanted_xcode_version or wanted_xcode_version == xcode_version:
print_collapsed_group(":xcode: Activating Xcode {}...".format(xcode_version))
else:
Expand Down Expand Up @@ -1603,9 +1603,6 @@ def upload_bazel_binary(platform):
binary_dir = "bazel-bin/src"
binary_name = "bazel"
binary_nojdk_name = "bazel_nojdk"
if is_lab_machine():
eprint("Uploading to GCS through buildkite-agent is currently not supported on lab machines.")
return
execute_command(["buildkite-agent", "artifact", "upload", binary_name], cwd=binary_dir)
execute_command(["buildkite-agent", "artifact", "upload", binary_nojdk_name], cwd=binary_dir)

Expand Down Expand Up @@ -2601,9 +2598,6 @@ def upload_json_profile(json_profile_path, tmpdir):
if not os.path.exists(json_profile_path):
return
print_collapsed_group(":gcloud: Uploading JSON Profile")
if is_lab_machine():
eprint("Uploading to GCS through buildkite-agent is currently not supported on lab machines.")
return
execute_command(["buildkite-agent", "artifact", "upload", json_profile_path], cwd=tmpdir)


Expand All @@ -2613,9 +2607,6 @@ def upload_corrupted_outputs(capture_corrupted_outputs_dir, tmpdir):
if not os.path.exists(capture_corrupted_outputs_dir):
return
print_collapsed_group(":gcloud: Uploading corrupted outputs")
if is_lab_machine():
eprint("Uploading to GCS through buildkite-agent is currently not supported on lab machines.")
return
execute_command(
["buildkite-agent", "artifact", "upload", "{}/**/*".format(capture_corrupted_outputs_dir)],
cwd=tmpdir,
Expand Down

0 comments on commit 5e8336e

Please sign in to comment.