SERVER-120345: Set activate=false for streams arm64 variants (#48596)

GitOrigin-RevId: 4350c0a48d927119ff0ec0ba5dd42a628971d465
This commit is contained in:
Calvin Nix
2026-02-25 14:53:56 -05:00
committed by MongoDB Bot
parent 72e6ce6c01
commit 65e3cec072
5 changed files with 34 additions and 18 deletions

View File

@@ -19,10 +19,11 @@ from buildscripts.util.read_config import read_config_file
def make_testing_gate_task(compile_variant: str) -> Task:
dependencies = {
TaskDependency("aggregation", compile_variant.replace("-arm64", "")),
TaskDependency("aggregation", compile_variant),
TaskDependency(".streams_release_test", compile_variant.replace("-arm64", "")),
TaskDependency(".streams_release_test", compile_variant),
# TODO(SERVER-120347): Re-add arm64 dependencies once we are ready to switch to using arm64.
# TaskDependency("aggregation", f"{compile_variant}-arm64"),
# TaskDependency(".streams_release_test", f"{compile_variant}-arm64"),
}
return Task(f"streams_testing_gate_{compile_variant}", [], dependencies)
@@ -40,11 +41,13 @@ def make_task(compile_variant: str, break_glass: str) -> Task:
dep_task_prefix += "break_glass_"
script_args.append("--break-glass")
else:
dependencies.add(TaskDependency("aggregation", compile_variant.replace("-arm64", "")))
dependencies.add(TaskDependency("aggregation", compile_variant))
# TODO(SERVER-120347): Re-add arm64 dependency once we are ready to switch to using arm64.
# dependencies.add(TaskDependency("aggregation", f"{compile_variant}-arm64"))
dependencies.add(TaskDependency(".streams_release_test"))
dependencies.add(TaskDependency(f"{dep_task_prefix}{compile_variant.replace('-arm64', '')}"))
dependencies.add(TaskDependency(f"{dep_task_prefix}{compile_variant}"))
# TODO(SERVER-120347): Re-add arm64 dependency once we are ready to switch to using arm64.
# dependencies.add(TaskDependency(f"{dep_task_prefix}{compile_variant}-arm64"))
commands = [
BuiltInCommand("manifest.load", {}),
@@ -82,8 +85,9 @@ def main(
current_task_name = expansions.get("task_name", "streams_publish_manifest_gen")
compile_variant_name = expansions.get("compile_variant")
if not compile_variant_name.endswith("-arm64"):
raise RuntimeError("This task should only run on the arm64 compile variant")
# TODO(SERVER-120347): Re-enable arm64 assertion once we are ready to switch to using arm64.
# if not compile_variant_name.endswith("-arm64"):
# raise RuntimeError("This task should only run on the arm64 compile variant")
build_variant = BuildVariant(name=build_variant_name)
build_variant.display_task(

View File

@@ -769,8 +769,9 @@ tasks:
omit_generated_tasks: true
- name: streams_build_and_push_gen
variant: enterprise-amazon2023-streams
- name: streams_build_and_push_gen
variant: enterprise-amazon2023-streams-arm64
# TODO(SERVER-120347): Re-add arm64 dependency once we are ready to switch to using arm64.
# - name: streams_build_and_push_gen
# variant: enterprise-amazon2023-streams-arm64
commands:
- func: "streams publish manifest"
@@ -785,8 +786,9 @@ tasks:
omit_generated_tasks: true
- name: streams_build_and_push_break_glass_gen
variant: enterprise-amazon2023-streams
- name: streams_build_and_push_break_glass_gen
variant: enterprise-amazon2023-streams-arm64
# TODO(SERVER-120347): Re-add arm64 dependency once we are ready to switch to using arm64.
# - name: streams_build_and_push_break_glass_gen
# variant: enterprise-amazon2023-streams-arm64
commands:
- func: "streams publish manifest"
vars:

View File

@@ -31,6 +31,8 @@ buildvariants:
- name: enterprise-amazon2023-streams-arm64
display_name: "Amazon Linux 2023 enterprise streams arm64"
# TODO(SERVER-120347): Re-enable once we are ready to switch to using arm64.
activate: false
modules: ["asp-js-engine"]
run_on:
- amazon2023-arm64-latest-m8g-xlarge
@@ -55,6 +57,8 @@ buildvariants:
- name: enterprise-amazon2023-streams-tsan
display_name: "TSAN Amazon Linux 2023 arm64 enterprise streams"
# TODO(SERVER-120347): Re-enable once we are ready to switch to using arm64.
activate: false
modules: ["asp-js-engine"]
run_on:
- amazon2023-arm64-latest-m8g-xlarge
@@ -87,6 +91,8 @@ buildvariants:
- name: enterprise-amazon2023-streams-aubsan
display_name: "{A,UB}SAN Amazon Linux 2023 arm64 enterprise streams"
# TODO(SERVER-120347): Re-enable once we are ready to switch to using arm64.
activate: false
modules: ["asp-js-engine"]
run_on:
- amazon2023-arm64-latest-m8g-xlarge

View File

@@ -66,10 +66,16 @@ buildvariants:
- name: streams_build_and_push_gen
- name: streams_build_and_push_break_glass_gen
activate: false # Only run on manual patches
# TODO(SERVER-120347): Move back to arm64 variant once we are ready to switch to using arm64.
- name: streams_publish_manifest_al2023_gen
- name: streams_publish_manifest_al2023_break_glass_gen
activate: false # Only run on manual patches
- name: generate_buildid_to_debug_symbols_mapping
- name: enterprise-amazon2023-streams-arm64
display_name: "Amazon Linux 2023 enterprise build with streams arm64"
# TODO(SERVER-120347): Re-enable once we are ready to switch to using arm64.
activate: false
cron: "0 3 * * *" # From the ${project_nightly_cron} parameter.
modules: ["asp-js-engine"]
run_on:
@@ -126,8 +132,4 @@ buildvariants:
- name: streams_build_and_push_gen
- name: streams_build_and_push_break_glass_gen
activate: false # Only run on manual patches
# Only needed once to generate the streams manifest for both x86 and arm
- name: streams_publish_manifest_al2023_gen
- name: streams_publish_manifest_al2023_break_glass_gen
activate: false # Only run on manual patches
- name: generate_buildid_to_debug_symbols_mapping

View File

@@ -37,13 +37,15 @@ for arg in "$@"; do
done
# Creating the manifest.
# TODO(SERVER-120347): Re-add arm64 image once we are ready to switch to using arm64.
docker manifest create $IMAGE:$GITSHA$DISTRO_SUFFIX \
$IMAGE:$GITSHA-arm64$DISTRO_SUFFIX \
$IMAGE:$GITSHA-amd64$DISTRO_SUFFIX
# $IMAGE:$GITSHA-arm64$DISTRO_SUFFIX
# Annotating arm64.
docker manifest annotate $IMAGE:$GITSHA$DISTRO_SUFFIX \
$IMAGE:$GITSHA-arm64$DISTRO_SUFFIX --os linux --arch arm64
# TODO(SERVER-120347): Re-add arm64 annotation once we are ready to switch to using arm64.
# # Annotating arm64.
# docker manifest annotate $IMAGE:$GITSHA$DISTRO_SUFFIX \
# $IMAGE:$GITSHA-arm64$DISTRO_SUFFIX --os linux --arch arm64
# Annotating amd64.
docker manifest annotate $IMAGE:$GITSHA$DISTRO_SUFFIX \