From e2c0bc8bd99458d00ac7a58c78bd677ac07ce3b2 Mon Sep 17 00:00:00 2001 From: Thomas Ward <22226719+tward333@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:20:22 -0400 Subject: SERVER-91670 Platform Support: Bump Amazon2023.0 to Amazon2023.3 (arm and x86) (#23971) GitOrigin-RevId: 03616ea832135e4b5154c08f22ec73b68bc98680 --- buildscripts/packager.py | 2 +- .../variants/amazon/test_dev.yml | 8 ++--- .../amazon/test_dev_master_branch_only.yml | 4 +-- .../variants/amazon/test_release.yml | 42 +++++++++++----------- .../variants/misc/misc_master_branch_only.yml | 4 +-- etc/system_perf.yml | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/buildscripts/packager.py b/buildscripts/packager.py index afa61a4a119..2e19ed8cb92 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -291,7 +291,7 @@ class Distro(object): elif self.dname == 'amazon2': return "2017.12" elif self.dname == 'amazon2023': - return "2023.0" + return "2023.3" elif self.dname == 'ubuntu': if build_os == 'ubuntu1204': return "precise" diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev.yml b/etc/evergreen_yml_components/variants/amazon/test_dev.yml index 0b2129e4bef..a76da8eef7e 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev.yml @@ -245,7 +245,7 @@ buildvariants: cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: - - amazon2023.0-small + - amazon2023.3-small expansions: compile_flags: >- --ssl @@ -266,7 +266,7 @@ buildvariants: tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-large + - amazon2023.3-large - name: search - name: search_auth - name: search_pinned_connections_auth @@ -283,7 +283,7 @@ buildvariants: cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: - - amazon2023.0-arm64-small + - amazon2023.3-arm64-small expansions: compile_flags: >- --ssl @@ -308,7 +308,7 @@ buildvariants: tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large - name: search - name: search_auth - name: search_pinned_connections_auth diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml index c5161395c9e..b393c4a170e 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml @@ -124,7 +124,7 @@ buildvariants: tags: ["bazel_check"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - amazon2023.0-arm64-small + - amazon2023.3-arm64-small stepback: false expansions: compile_variant: *amazon-linux-2023-arm64-bazel-compile @@ -219,7 +219,7 @@ buildvariants: tags: ["required"] cron: "0 */4 * * *" run_on: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large expansions: compile_flags: >- --ssl diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index 13b90bf8626..00f62462f22 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -229,7 +229,7 @@ buildvariants: tags: ["bazel_check"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - amazon2023.0-small + - amazon2023.3-small expansions: push_path: linux push_bucket: downloads.mongodb.org @@ -250,12 +250,12 @@ buildvariants: packager_distro: amazon2023 repo_edition: org scons_cache_scope: shared - large_distro_name: amazon2023.0-large + large_distro_name: amazon2023.3-large compile_variant: amazon2023 tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-large + - amazon2023.3-large - name: test_packages distros: - ubuntu2204-large @@ -267,7 +267,7 @@ buildvariants: tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - amazon2023.0-small + - amazon2023.3-small expansions: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug push_path: linux @@ -296,7 +296,7 @@ buildvariants: tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-large + - amazon2023.3-large - name: test_packages distros: - ubuntu2204-large @@ -310,7 +310,7 @@ buildvariants: # tags: [] # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. # run_on: - # - amazon2023.0-small + # - amazon2023.3-small # expansions: # additional_package_targets: archive-mongocryptd archive-mongocryptd-debug # compile_flags: >- @@ -335,30 +335,30 @@ buildvariants: # # TODO SERVER-64479 remove external_auth_jobs_max once resolved # external_auth_jobs_max: 1 # compile_variant: enterprise-amazon2023-lto - # large_distro_name: amazon2023.0-large + # large_distro_name: amazon2023.3-large # tasks: # - name: compile_test_and_package_serial_lto_no_unittests_TG # distros: - # - amazon2023.0-large + # - amazon2023.3-large # # TODO: SERVER-79886 Fix broken test_packages task # # - name: test_packages # # distros: - # # - amazon2023.0-large + # # - amazon2023.3-large # - name: .development_critical !.requires_large_host # - name: .development_critical .requires_large_host # distros: - # - amazon2023.0-large + # - amazon2023.3-large # - name: .release_critical !.requires_large_host !publish_packages !push !crypt_push # - name: .release_critical .requires_large_host !publish_packages !push !crypt_push # distros: - # - amazon2023.0-large + # - amazon2023.3-large - name: amazon2023-arm64 display_name: "Amazon Linux 2023 arm64" tags: ["bazel_check"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - amazon2023.0-arm64-small + - amazon2023.3-arm64-small expansions: push_path: linux push_bucket: downloads.mongodb.org @@ -380,12 +380,12 @@ buildvariants: packager_distro: amazon2023 repo_edition: org scons_cache_scope: shared - large_distro_name: amazon2023.0-arm64-large + large_distro_name: amazon2023.3-arm64-large compile_variant: amazon2023-arm64 tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large - name: test_packages distros: - ubuntu2204-arm64-large @@ -398,7 +398,7 @@ buildvariants: tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - amazon2023.0-arm64-small + - amazon2023.3-arm64-small expansions: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug push_path: linux @@ -427,7 +427,7 @@ buildvariants: tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large - name: test_packages distros: - ubuntu2204-arm64-large @@ -442,7 +442,7 @@ buildvariants: # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. # activate: false # run_on: - # - amazon2023.0-arm64-small + # - amazon2023.3-arm64-small # expansions: # additional_package_targets: archive-mongocryptd archive-mongocryptd-debug # compile_flags: >- @@ -467,11 +467,11 @@ buildvariants: # # TODO SERVER-64479 remove external_auth_jobs_max once resolved # external_auth_jobs_max: 1 # compile_variant: enterprise-amazon2023-arm64-lto - # large_distro_name: amazon2023.0-arm64-large + # large_distro_name: amazon2023.3-arm64-large # tasks: # - name: compile_test_and_package_serial_lto_no_unittests_TG # distros: - # - amazon2023.0-arm64-large + # - amazon2023.3-arm64-large # # TODO: SERVER-79886 Fix broken test_packages task # # - name: test_packages # # distros: @@ -479,11 +479,11 @@ buildvariants: # - name: .development_critical !.requires_large_host # - name: .development_critical .requires_large_host # distros: - # - amazon2023.0-arm64-large + # - amazon2023.3-arm64-large # - name: .release_critical !.requires_large_host !publish_packages !push !crypt_push # - name: .release_critical .requires_large_host !publish_packages !push !crypt_push # distros: - # - amazon2023.0-arm64-large + # - amazon2023.3-arm64-large - name: enterprise-amazon2-streams display_name: "Amazon Linux 2 enterprise build with streams" diff --git a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml index f53b630cc33..3af79162c44 100644 --- a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml @@ -66,14 +66,14 @@ buildvariants: cron: "0 4 * * *" # From the ${project_nightly_cron} parameter stepback: false run_on: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large expansions: compile_flags: >- --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) repo_edition: enterprise - large_distro_name: amazon2023.0-arm64-large + large_distro_name: amazon2023.3-arm64-large num_scons_link_jobs_available: 0.1 tasks: - name: build_metrics_tasks_gen diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 8f7323d9462..5652073847a 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -912,7 +912,7 @@ buildvariants: --release --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars run_on: - - amazon2023.0-arm64-large + - amazon2023.3-arm64-large tasks: - name: compile_and_package_serial_no_unittests_TG - name: package_new_compile -- cgit v1.2.3