File tree Expand file tree Collapse file tree 6 files changed +63
-278
lines changed
Expand file tree Collapse file tree 6 files changed +63
-278
lines changed Original file line number Diff line number Diff line change @@ -8,4 +8,4 @@ source .evergreen/features.sh
88
99FEATURE_FLAGS+=(" ${STANDARD_FEATURES[@]} " )
1010
11- cargo nextest archive --workspace $( features_option) --archive-file ${ARCHIVE_FILE}
11+ cargo nextest archive --workspace $( features_option) --archive-file nextest-archive.tar.zst
Original file line number Diff line number Diff line change @@ -76,16 +76,16 @@ buildvariants:
7676 - name : rhel-8
7777 display_name : " RHEL 8"
7878 run_on :
79- - rhel87 -small
79+ - rhel8-latest -small
8080 expansions :
8181 AUTH : auth
8282 SSL : ssl
83- ARCHIVE_FILE : " nextest-archive.tar.zst "
83+ USE_NEXTEST_ARCHIVE : true
8484 tasks :
8585 - name : build-nextest-archive
86- - name : .standalone .archive
87- - name : .replicaset .archive
88- - name : .sharded .archive
86+ - name : .standalone
87+ - name : .replicaset
88+ - name : .sharded
8989
9090 - name : ubuntu-22.04-arm64
9191 display_name : " Ubuntu 22.04 (ARM64)"
@@ -1261,18 +1261,17 @@ tasks:
12611261 - .evergreen/build-nextest-archive.sh
12621262 include_expansions_in_env :
12631263 - PROJECT_DIRECTORY
1264- - ARCHIVE_FILE
12651264 - command : s3.put
12661265 type : setup
12671266 params :
12681267 aws_key : ${aws_key}
12691268 aws_secret : ${aws_secret}
1270- local_file : src/${ARCHIVE_FILE}
1271- remote_file : ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-${ARCHIVE_FILE}
1269+ local_file : src/nextest-archive.tar.zst
1270+ remote_file : ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-nextest-archive.tar.zst
12721271 bucket : mciuploads
12731272 permissions : public-read
12741273 content_type : application/zstd
1275- display_name : ${ARCHIVE_FILE}
1274+ display_name : nextest-archive.tar.zst
12761275
12771276# ############
12781277# Functions #
@@ -1578,7 +1577,7 @@ functions:
15781577 - ZSTD
15791578 - ZLIB
15801579 - SNAPPY
1581- - ARCHIVE_FILE
1580+ - USE_NEXTEST_ARCHIVE
15821581
15831582 " run sync tests " :
15841583 - command : subprocess.exec
Original file line number Diff line number Diff line change @@ -19,18 +19,9 @@ tasks:"
1919 "
2020 - name: test-{version}-{top_name}
2121 tags: [{version}, {top_name}]
22- commands:
23- - func: \" bootstrap mongo-orchestration\"
24- type: setup
25- vars:
26- MONGODB_VERSION: {version}
27- TOPOLOGY: {topology}
28- - func: \" run driver test suite\"
29-
30- - name: test-{version}-{top_name}-archive
31- tags: [{version}, {top_name}, archive]
3222 depends_on:
3323 - name: build-nextest-archive
24+ patch_optional: true
3425 commands:
3526 - command: s3.get
3627 type: setup
@@ -42,6 +33,7 @@ tasks:"
4233 ${{build_id}}-nextest-archive.tar.zst
4334 bucket: mciuploads
4435 local_file: src/nextest-archive.tar.zst
36+ optional: true
4537 - func: \" bootstrap mongo-orchestration\"
4638 type: setup
4739 vars:
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -24,10 +24,10 @@ if [ "$SNAPPY" = true ]; then
2424 FEATURE_FLAGS+=(" snappy-compression" )
2525fi
2626
27- if [[ " ${ARCHIVE_FILE} " != " " ] ]; then
27+ if [ " $USE_NEXTEST_ARCHIVE " = true ]; then
2828 # Feature flags are set when the archive is built
2929 FEATURE_FLAGS=()
30- CARGO_OPTIONS+=(" --archive-file" " ${ARCHIVE_FILE} " " --workspace-remap" " $( pwd) " )
30+ CARGO_OPTIONS+=(" --archive-file" " nextest-archive.tar.zst " " --workspace-remap" " $( pwd) " )
3131fi
3232
3333echo " cargo test options: $( cargo_test_options) "
@@ -39,6 +39,7 @@ if [ "Windows_NT" == "$OS" ]; then
3939 export SSL_CERT_DIR=$( cygpath /etc/ssl/certs --windows)
4040fi
4141
42+ sleep 60s
4243cargo_test " "
4344
4445# cargo-nextest doesn't support doc tests
You can’t perform that action at this time.
0 commit comments