Skip to content

Commit ff85209

Browse files
committed
remaining conversions
1 parent 10a5001 commit ff85209

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.evergreen/cargo-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CARGO_RESULT=0
66

77
. .evergreen/features.sh
88

9-
if [[ "$USE_NEXTEST_ARCHIVE" = true ]]; then
9+
if [[ -f nextest-archive.tar.zst ]]; then
1010
WORKSPACE_ROOT="$(pwd)"
1111
if [[ "Windows_NT" = "$OS" ]]; then
1212
WORKSPACE_ROOT="$(cygpath -w ${WORKSPACE_ROOT})"
@@ -17,7 +17,7 @@ fi
1717

1818
cargo_test_options() {
1919
FEATURES="$(features_option)"
20-
if [[ "$USE_NEXTEST_ARCHIVE" = true ]]; then
20+
if [[ -f nextest-archive.tar.zst ]]; then
2121
# Feature flags are set when the archive is built
2222
FEATURES=""
2323
fi

.evergreen/config.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ buildvariants:
8282
expansions:
8383
AUTH: auth
8484
SSL: ssl
85-
USE_NEXTEST_ARCHIVE: true
8685
tasks:
8786
- name: build-nextest-archive
8887
- name: .standalone
@@ -96,7 +95,6 @@ buildvariants:
9695
expansions:
9796
AUTH: auth
9897
SSL: ssl
99-
USE_NEXTEST_ARCHIVE: true
10098
tasks:
10199
- name: build-nextest-archive
102100
# Ubuntu 22.04 does not support MongoDB versions below 6.0.
@@ -111,7 +109,6 @@ buildvariants:
111109
expansions:
112110
AUTH: auth
113111
SSL: ssl
114-
USE_NEXTEST_ARCHIVE: true
115112
tasks:
116113
- name: build-nextest-archive
117114
- name: .standalone
@@ -125,7 +122,6 @@ buildvariants:
125122
expansions:
126123
AUTH: auth
127124
SSL: ssl
128-
USE_NEXTEST_ARCHIVE: true
129125
tasks:
130126
- name: build-nextest-archive
131127
- name: .standalone
@@ -140,7 +136,6 @@ buildvariants:
140136
OPENSSL: true
141137
AUTH: auth
142138
SSL: ssl
143-
USE_NEXTEST_ARCHIVE: true
144139
tasks:
145140
- name: build-nextest-archive
146141
- name: .rapid .replicaset
@@ -154,7 +149,6 @@ buildvariants:
154149
OPENSSL: true
155150
AUTH: auth
156151
SSL: ssl
157-
USE_NEXTEST_ARCHIVE: true
158152
tasks:
159153
- name: build-nextest-archive
160154
- name: .rapid .replicaset
@@ -168,7 +162,6 @@ buildvariants:
168162
OPENSSL: true
169163
AUTH: auth
170164
SSL: ssl
171-
USE_NEXTEST_ARCHIVE: true
172165
tasks:
173166
- name: build-nextest-archive
174167
- name: .rapid .replicaset
@@ -182,7 +175,6 @@ buildvariants:
182175
OPENSSL: true
183176
AUTH: auth
184177
SSL: ssl
185-
USE_NEXTEST_ARCHIVE: true
186178
tasks:
187179
- name: build-nextest-archive
188180
- name: .rapid .replicaset
@@ -191,15 +183,13 @@ buildvariants:
191183
display_name: "No Auth/TLS"
192184
run_on:
193185
- rhel8-latest-small
194-
expansions:
195-
USE_NEXTEST_ARCHIVE: true
196186
tasks:
197187
- name: build-nextest-archive
198188
- .rapid .replicaset
199189

200190
- name: compression
201191
display_name: "Compression"
202-
patchable: false
192+
#patchable: false
203193
run_on:
204194
- rhel8-latest-small
205195
expansions:
@@ -217,7 +207,6 @@ buildvariants:
217207
REQUIRE_API_VERSION: true
218208
MONGODB_API_VERSION: 1
219209
AUTH: auth
220-
USE_NEXTEST_ARCHIVE: true
221210
# Configuring SSL: ssl causes errors in bootstrap mongo-orchestration.
222211
tasks:
223212
- name: build-nextest-archive
@@ -402,6 +391,7 @@ buildvariants:
402391
run_on:
403392
- rhel8-latest-small
404393
tasks:
394+
- name: build-nextest-archive
405395
- .load-balancer
406396

407397
- name: search-index
@@ -444,6 +434,7 @@ buildvariants:
444434
run_on:
445435
- amazon2023-arm64-latest-large-m8g
446436
tasks:
437+
- name: build-nextest-archive
447438
- name: .latest
448439
#- name: .8.0
449440
#- name: .7.0
@@ -1188,7 +1179,10 @@ tasks:
11881179

11891180
- name: test-load-balancer-5.0
11901181
tags: [load-balancer]
1182+
depends_on:
1183+
- name: build-nextest-archive
11911184
commands:
1185+
- func: "fetch nextest archive"
11921186
- func: bootstrap mongo-orchestration
11931187
vars:
11941188
MONGODB_VERSION: 5.0
@@ -1199,7 +1193,10 @@ tasks:
11991193

12001194
- name: test-load-balancer-6.0
12011195
tags: [load-balancer]
1196+
depends_on:
1197+
- name: build-nextest-archive
12021198
commands:
1199+
- func: "fetch nextest archive"
12031200
- func: bootstrap mongo-orchestration
12041201
vars:
12051202
MONGODB_VERSION: 6.0
@@ -1210,7 +1207,10 @@ tasks:
12101207

12111208
- name: test-load-balancer-7.0
12121209
tags: [load-balancer]
1210+
depends_on:
1211+
- name: build-nextest-archive
12131212
commands:
1213+
- func: "fetch nextest archive"
12141214
- func: bootstrap mongo-orchestration
12151215
vars:
12161216
MONGODB_VERSION: 7.0
@@ -1221,7 +1221,10 @@ tasks:
12211221

12221222
- name: test-load-balancer-rapid
12231223
tags: [load-balancer]
1224+
depends_on:
1225+
- name: build-nextest-archive
12241226
commands:
1227+
- func: "fetch nextest archive"
12251228
- func: bootstrap mongo-orchestration
12261229
vars:
12271230
MONGODB_VERSION: rapid
@@ -1232,7 +1235,10 @@ tasks:
12321235

12331236
- name: test-load-balancer-latest
12341237
tags: [load-balancer]
1238+
depends_on:
1239+
- name: build-nextest-archive
12351240
commands:
1241+
- func: "fetch nextest archive"
12361242
- func: bootstrap mongo-orchestration
12371243
vars:
12381244
MONGODB_VERSION: latest
@@ -1683,7 +1689,6 @@ functions:
16831689
- ZSTD
16841690
- ZLIB
16851691
- SNAPPY
1686-
- USE_NEXTEST_ARCHIVE
16871692

16881693
"run sync tests":
16891694
- command: subprocess.exec
@@ -1757,8 +1762,6 @@ functions:
17571762
binary: bash
17581763
args:
17591764
- .evergreen/run-csfle-tests.sh
1760-
env:
1761-
USE_NEXTEST_ARCHIVE: "true"
17621765
include_expansions_in_env:
17631766
- DRIVERS_TOOLS
17641767
- PROJECT_DIRECTORY

0 commit comments

Comments
 (0)