Skip to content

Commit edc2377

Browse files
authored
Move ARM64 Rocky Linux workers into arm64 queue (#2282)
This change also removes the custom setup for the ubuntu2004_arm64 platform that was necessary when we were not running on GCE machines. It should only be merged once new images with #2280 have been deployed. Progress towards #2272
1 parent 95075fb commit edc2377

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

buildkite/bazelci.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
"publish_binary": ["linux_arm64"],
304304
"docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/rockylinux8",
305305
"python": "python3.8",
306-
"queue": "arm64_v2", # TODO(#2272): change to arm64
306+
"queue": "arm64",
307307
},
308308
"rockylinux8_java11": {
309309
"name": "Rocky Linux 8 (OpenJDK 11, gcc 8.5.0)",
@@ -368,8 +368,6 @@
368368
"docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2004",
369369
"python": "python3.8",
370370
"queue": "arm64",
371-
# TODO(#2272): Re-enable always-pull if we also publish docker containers for Linux ARM64
372-
"always-pull": False,
373371
},
374372
"kythe_ubuntu2004": {
375373
"name": "Kythe (Ubuntu 20.04 LTS)",
@@ -1807,10 +1805,6 @@ def remote_caching_flags(platform, accept_cached=True):
18071805
# Only enable caching for untrusted and testing builds, except for trusted MacOS VMs.
18081806
if THIS_IS_TRUSTED and not is_mac():
18091807
return []
1810-
# We don't enable remote caching on the Linux ARM64 machine since it doesn't have access to GCS.
1811-
# TODO(#2272): Delete once GCE workers are running.
1812-
if platform == "ubuntu2004_arm64":
1813-
return []
18141808

18151809
platform_cache_key = [
18161810
BUILDKITE_ORG.encode("utf-8"),
@@ -2724,7 +2718,6 @@ def create_step(
27242718
image=PLATFORMS[platform]["docker-image"],
27252719
commands=commands,
27262720
queue=PLATFORMS[platform].get("queue", "default"),
2727-
always_pull=PLATFORMS[platform].get("always-pull", True),
27282721
)
27292722
else:
27302723
step = {
@@ -2774,7 +2767,7 @@ def create_step(
27742767

27752768

27762769
def create_docker_step(
2777-
label, image, commands=None, additional_env_vars=None, queue="default", always_pull=True
2770+
label, image, commands=None, additional_env_vars=None, queue="default"
27782771
):
27792772
env = ["ANDROID_HOME", "ANDROID_NDK_HOME", "BUILDKITE_ARTIFACT_UPLOAD_DESTINATION"]
27802773
if THIS_IS_TRUSTED:
@@ -2789,7 +2782,7 @@ def create_docker_step(
27892782
"agents": {"queue": queue},
27902783
"plugins": {
27912784
"docker#v3.8.0": {
2792-
"always-pull": always_pull,
2785+
"always-pull": True,
27932786
"environment": env,
27942787
"image": image,
27952788
"network": "host",

0 commit comments

Comments
 (0)