Skip to content

Commit 9e5dc71

Browse files
zackwintermdbMongoDB Bot
authored andcommitted
SERVER-108219 Increase size of the Amazon 2023 ARM compile (more) (#39497)
GitOrigin-RevId: 4a921ff69642025f0f18021b153077cdb0caee1a
1 parent 1ff43a7 commit 9e5dc71

File tree

3 files changed

+80
-66
lines changed

3 files changed

+80
-66
lines changed

etc/evergreen_yml_components/definitions.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,13 @@ functions:
170170
aws_secret: ${aws_secret}
171171
remote_file: ${mongo_artifacts}
172172
bucket: mciuploads
173-
extract_to: "./"
173+
local_file: "fetched_artifacts.tgz"
174+
175+
"extract artifacts": &extract_artifacts
176+
command: shell.exec
177+
params:
178+
script: |
179+
tar -xf fetched_artifacts.tgz
174180
175181
"fetch venv": &fetch_venv
176182
command: s3.get
@@ -796,6 +802,7 @@ functions:
796802
- *generate_github_token
797803
- *conditionally_clone_repo
798804
- *fetch_artifacts
805+
- *extract_artifacts
799806
- *kill_processes
800807
- *cleanup_environment
801808
- *fetch_venv
@@ -827,6 +834,7 @@ functions:
827834
"write and set downstream expansions":
828835
- *f_expansions_write
829836
- *fetch_artifacts
837+
- *extract_artifacts
830838
- *kill_processes
831839
- *cleanup_environment
832840
- *fetch_venv
@@ -1385,6 +1393,7 @@ functions:
13851393

13861394
"generate resmoke tasks":
13871395
- *fetch_artifacts
1396+
- *extract_artifacts
13881397
- *f_expansions_write
13891398
- *kill_processes
13901399
- *cleanup_environment

etc/evergreen_yml_components/tasks/compile_tasks_shared.yml

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -173,64 +173,63 @@ tasks:
173173
- func: "gen feature flags"
174174
- func: "fetch resmoke constants"
175175

176-
- command: archive.targz_pack
176+
- command: shell.exec
177177
params:
178-
target: "artifacts.tgz"
179-
source_dir: "./"
180-
include:
181-
- "./**.gcno"
182-
- "src/.bazel*"
183-
- "src/.npmrc"
184-
- "src/.resmoke_mongo_release_values.yml"
185-
- "src/.resmoke_mongo_version.yml"
186-
- "src/BUILD.bazel"
187-
- "src/MODULE.bazel"
188-
- "src/WORKSPACE.bazel"
189-
- "src/bazel/**"
190-
- "src/buildscripts/**"
191-
- "src/docker_compose/**"
192-
- "src/etc/*san.suppressions"
193-
- "src/etc/backports_required_for_multiversion_tests.yml"
194-
- "src/etc/evergreen.yml"
195-
- "src/etc/evergreen_nightly.yml"
196-
- "src/etc/evergreen_timeouts.yml"
197-
- "src/etc/evergreen_yml_components/**"
198-
- "src/etc/expansions.default.yml"
199-
- "src/etc/macos_dev_entitlements.xml"
200-
- "src/etc/repo_config.yaml"
201-
- "src/evergreen/**"
202-
- "src/jsconfig.json"
203-
- "src/jstests/**"
204-
- "src/package.json"
205-
- "src/patch_files.txt"
206-
- "src/patch_test_tags.tgz"
207-
- "src/pnpm-lock.yaml"
208-
- "src/poetry.lock"
209-
- "src/poetry_requirements.txt"
210-
- "src/pyproject.toml"
211-
- "src/src/**.idl"
212-
- "src/src/**.yml"
213-
- "src/src/mongo/client/sdam/json_tests/sdam_tests/**"
214-
- "src/src/mongo/client/sdam/json_tests/server_selection_tests/**"
215-
- "src/src/mongo/db/modules/atlas/evergreen/**"
216-
- "src/src/mongo/db/modules/atlas/jstests/**"
217-
- "src/src/mongo/db/modules/enterprise/docs/**"
218-
- "src/src/mongo/db/modules/enterprise/jstests/**"
219-
- "src/src/mongo/db/modules/subscription/jstests/**"
220-
- "src/src/mongo/db/query/benchmark/data_generator/**"
221-
- "src/src/mongo/db/query/query_tester/tests/**"
222-
- "src/src/mongo/util/options_parser/test_config_files/**"
223-
- "src/src/mongo/util/version/**"
224-
- "src/src/third_party/JSON-Schema-Test-Suite/tests/draft4/**"
225-
- "src/src/third_party/abseil-cpp/**"
226-
- "src/src/third_party/grpc/**"
227-
- "src/src/third_party/mock_ocsp_responder/**"
228-
- "src/src/third_party/protobuf/**"
229-
- "src/src/third_party/schemastore.org/**"
230-
- "src/tools/**"
231-
- "src/x509/**"
232-
exclude_files:
233-
- "src/*_test.pdb"
178+
script: |
179+
shopt -s globstar
180+
for f in ./**/*.gcno \
181+
src/.bazel* \
182+
src/.npmrc \
183+
src/.resmoke_mongo_release_values.yml \
184+
src/.resmoke_mongo_version.yml \
185+
src/BUILD.bazel \
186+
src/MODULE.bazel \
187+
src/WORKSPACE.bazel \
188+
src/bazel/**/* \
189+
src/buildscripts/**/* \
190+
src/docker_compose/**/* \
191+
src/etc/*san.suppressions \
192+
src/etc/backports_required_for_multiversion_tests.yml \
193+
src/etc/evergreen.yml \
194+
src/etc/evergreen_nightly.yml \
195+
src/etc/evergreen_timeouts.yml \
196+
src/etc/evergreen_yml_components/**/* \
197+
src/etc/expansions.default.yml \
198+
src/etc/macos_dev_entitlements.xml \
199+
src/etc/repo_config.yaml \
200+
src/evergreen/**/* \
201+
src/jsconfig.json \
202+
src/jstests/**/* \
203+
src/package.json \
204+
src/patch_files.txt \
205+
src/patch_test_tags.tgz \
206+
src/pnpm-lock.yaml \
207+
src/poetry.lock \
208+
src/poetry_requirements.txt \
209+
src/pyproject.toml \
210+
src/src/**/*.idl \
211+
src/src/**/*.yml \
212+
src/src/mongo/client/sdam/json_tests/sdam_tests/**/* \
213+
src/src/mongo/client/sdam/json_tests/server_selection_tests/**/* \
214+
src/src/mongo/db/modules/atlas/evergreen/**/* \
215+
src/src/mongo/db/modules/atlas/jstests/**/* \
216+
src/src/mongo/db/modules/enterprise/docs/**/* \
217+
src/src/mongo/db/modules/enterprise/jstests/**/* \
218+
src/src/mongo/db/modules/subscription/jstests/**/* \
219+
src/src/mongo/db/query/benchmark/data_generator/**/* \
220+
src/src/mongo/db/query/query_tester/tests/**/* \
221+
src/src/mongo/util/options_parser/test_config_files/**/* \
222+
src/src/mongo/util/version/**/* \
223+
src/src/third_party/JSON-Schema-Test-Suite/tests/draft4/**/* \
224+
src/src/third_party/abseil-cpp/**/* \
225+
src/src/third_party/grpc/**/* \
226+
src/src/third_party/mock_ocsp_responder/**/* \
227+
src/src/third_party/protobuf/**/* \
228+
src/src/third_party/schemastore.org/**/* \
229+
src/tools/**/* \
230+
src/x509/**/*; do echo "$f" >> file_list.txt; echo >> file_list.txt; done
231+
tar -czf artifacts.tgz --exclude=*_test.pdb --ignore-failed-read --dereference -T file_list.txt
232+
rm file_list.txt
234233
235234
- command: s3.put
236235
params:

etc/evergreen_yml_components/variants/amazon/test_release.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ buildvariants:
8787
tasks:
8888
- name: compile_test_and_package_serial_TG
8989
distros:
90-
- amazon2-latest-large
90+
- amazon2-latest-c6i-32xlarge
9191
- name: run_unit_tests_TG
9292
distros:
93-
- amazon2-latest-large
93+
- amazon2-latest-c6i-32xlarge
9494
- name: test_packages
9595
distros:
9696
- ubuntu2204-large
@@ -136,6 +136,9 @@ buildvariants:
136136
- name: compile_test_and_package_serial_no_unittests_TG
137137
distros:
138138
- amazon2-arm64-latest-large
139+
- name: run_unit_tests_TG
140+
distros:
141+
- amazon2-arm64-latest-large
139142
- name: test_packages
140143
distros:
141144
- ubuntu2204-arm64-large
@@ -182,10 +185,13 @@ buildvariants:
182185
tasks:
183186
- name: compile_test_and_package_serial_no_unittests_TG
184187
distros:
185-
- amazon2-arm64-latest-large
188+
- amazon2-arm64-latest-xlarge
189+
- name: run_unit_tests_TG
190+
distros:
191+
- amazon2-arm64-latest-xlarge
186192
- name: test_packages
187193
distros:
188-
- ubuntu2204-arm64-large
194+
- ubuntu2204-large
189195
- name: .development_critical !.requires_large_host
190196
- name: .development_critical .requires_large_host
191197
distros:
@@ -273,10 +279,10 @@ buildvariants:
273279
tasks:
274280
- name: compile_test_and_package_serial_TG
275281
distros:
276-
- amazon2023.3-large
282+
- amazon2023.3-xlarge
277283
- name: run_unit_tests_TG
278284
distros:
279-
- amazon2023.3-large
285+
- amazon2023.3-xlarge
280286
- name: test_packages
281287
distros:
282288
- ubuntu2204-large
@@ -412,10 +418,10 @@ buildvariants:
412418
tasks:
413419
- name: compile_test_and_package_serial_TG
414420
distros:
415-
- amazon2023.3-arm64-xlarge
421+
- amazon2023.3-arm64-xxxlarge
416422
- name: run_unit_tests_TG
417423
distros:
418-
- amazon2023.3-arm64-large
424+
- amazon2023.3-arm64-xxlarge
419425
- name: test_packages
420426
distros:
421427
- ubuntu2204-arm64-large

0 commit comments

Comments
 (0)