Skip to content

Commit 43d8d22

Browse files
MikhailShchatkoEvergreen Agent
authored andcommitted
SERVER-83015 Move Ubuntu dev and release variants to separate files
1 parent 9e99c85 commit 43d8d22

File tree

7 files changed

+500
-492
lines changed

7 files changed

+500
-492
lines changed

etc/evergreen.yml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ include:
6262
- filename: etc/evergreen_yml_components/variants/compile_static_analysis.yml
6363
- filename: etc/evergreen_yml_components/variants/amazon/build_dev.yml
6464
- filename: etc/evergreen_yml_components/variants/amazon/test_dev.yml
65+
- filename: etc/evergreen_yml_components/variants/ubuntu/build_dev.yml
66+
- filename: etc/evergreen_yml_components/variants/ubuntu/test_dev.yml
6567
- filename: etc/evergreen_yml_components/variants/config_shard.yml
6668
- filename: etc/evergreen_yml_components/perf_tasks.yml
6769
- filename: etc/evergreen_yml_components/variants/perf.yml
@@ -2803,35 +2805,6 @@ buildvariants:
28032805
- name: external_auth_aws
28042806
- name: external_auth_oidc
28052807

2806-
- name: &enterprise-ubuntu2204-64-libvoidstar enterprise-ubuntu2204-64-libvoidstar
2807-
display_name: "~ Enterprise Ubuntu 22.04 w/ libvoidstar"
2808-
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
2809-
modules:
2810-
- enterprise
2811-
run_on:
2812-
- ubuntu2204-large
2813-
stepback: false
2814-
expansions:
2815-
compile_variant: *enterprise-ubuntu2204-64-libvoidstar
2816-
# Do not set link-model=dynamic on this build. The antithesis image builder
2817-
# scripts cannot handle the shared library build
2818-
compile_flags: >-
2819-
--ssl
2820-
--ocsp-stapling=off MONGO_DISTMOD=ubuntu2204
2821-
-j$(grep -c ^processor /proc/cpuinfo)
2822-
--variables-files=etc/scons/mongodbtoolchain_stable_clang.vars
2823-
CCFLAGS="-fsanitize-coverage=trace-pc-guard"
2824-
LIBS="voidstar"
2825-
multiversion_platform: ubuntu2204
2826-
multiversion_edition: enterprise
2827-
repo_edition: enterprise
2828-
large_distro_name: ubuntu2204-large
2829-
scons_cache_scope: shared
2830-
tasks:
2831-
- name: compile_and_archive_dist_test_TG
2832-
- name: .antithesis
2833-
- name: generate_buildid_to_debug_symbols_mapping
2834-
28352808
- <<: *enterprise-windows-nopush-template
28362809
name: &enterprise-windows-benchmarks enterprise-windows-benchmarks
28372810
display_name: "* Enterprise Windows (Benchmarks)"

etc/evergreen_nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ include:
99
- filename: etc/evergreen_yml_components/variants/amazon/test_release.yml
1010
- filename: etc/evergreen_yml_components/variants/debian/test_release.yml
1111
- filename: etc/evergreen_yml_components/variants/suse/test_release.yml
12+
- filename: etc/evergreen_yml_components/variants/ubuntu/test_release.yml
1213
### Comment out when using this file for a Rapid release branch. ###
1314
- filename: etc/evergreen_yml_components/variants/ibm.yml
1415
### Uncomment when using this file for a LTS release branch. ###

etc/evergreen_yml_components/variants/compile_static_analysis.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -255,19 +255,6 @@ buildvariants:
255255
- name: .crypt
256256
- name: generate_buildid_to_debug_symbols_mapping
257257

258-
# Note that this task is currently optional;
259-
# This will eventually become suggested, then required.
260-
- name: &ubuntu2204-arm64-bazel-compile ubuntu2204-arm64-bazel-compile
261-
display_name: "Ubuntu 22.04 arm64 Bazel Compile"
262-
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
263-
run_on:
264-
- ubuntu2204-arm64-small
265-
stepback: false
266-
expansions:
267-
compile_variant: *ubuntu2204-arm64-bazel-compile
268-
tasks:
269-
- name: compile_bazel_TG
270-
271258
# Note that this task is currently optional;
272259
# This will eventually become suggested, then required.
273260
- name: &windows-bazel-compile windows-bazel-compile

0 commit comments

Comments
 (0)