Skip to content

Commit 1e0dd95

Browse files
authored
RUST-1698 Use standardized os and db version for benchmarks (#949)
1 parent b286d1c commit 1e0dd95

File tree

1 file changed

+20
-69
lines changed

1 file changed

+20
-69
lines changed

.evergreen/benchmarks.yml

Lines changed: 20 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ functions:
132132
AUTH=${AUTH} \
133133
SSL=${SSL} \
134134
REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
135+
SKIP_LEGACY_SHELL=1 \
135136
sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
136137
# run-orchestration generates expansion file with the MONGODB_URI for the cluster
137138
- command: expansions.update
@@ -275,33 +276,18 @@ post:
275276
- func: "cleanup"
276277

277278
tasks:
278-
- name: "benchmark-rapid-standalone"
279-
tags: ["rapid", "standalone"]
279+
- name: "benchmark-driver"
280+
tags: ["driver"]
280281
commands:
281282
- func: "bootstrap mongo-orchestration"
282283
vars:
283-
MONGODB_VERSION: "rapid"
284-
TOPOLOGY: "server"
285-
- func: "run driver benchmarks"
286-
- func: "upload benchmark results"
287-
288-
- name: "benchmark-rapid-replica_set"
289-
tags: ["rapid", "replica_set"]
290-
commands:
291-
- func: "bootstrap mongo-orchestration"
292-
vars:
293-
MONGODB_VERSION: "rapid"
294-
TOPOLOGY: "replica_set"
295-
- func: "run driver benchmarks"
296-
- func: "upload benchmark results"
297-
298-
- name: "benchmark-rapid-sharded_cluster"
299-
tags: ["rapid", "sharded_cluster"]
300-
commands:
301-
- func: "bootstrap mongo-orchestration"
302-
vars:
303-
MONGODB_VERSION: "rapid"
304-
TOPOLOGY: "sharded_cluster"
284+
MONGODB_VERSION: "v6.0-perf"
285+
# Note that drivers-evergreen-tools expects `SSL` as the environmental
286+
# variable, not `TLS`, so we have to use that for the actual value used in the
287+
# script; we use `TLS` for the metadata that isn't used by the actual shell
288+
# scripts.
289+
AUTH: "auth"
290+
SSL: "ssl"
305291
- func: "run driver benchmarks"
306292
- func: "upload benchmark results"
307293

@@ -317,14 +303,6 @@ tasks:
317303
- func: "upload benchmark results"
318304

319305
axes:
320-
- id: "mongodb-version"
321-
display_name: MongoDB Version
322-
values:
323-
- id: "rapid"
324-
display_name: "rapid"
325-
variables:
326-
MONGODB_VERSION: "rapid"
327-
328306
- id: "topology"
329307
display_name: Topology
330308
values:
@@ -353,69 +331,42 @@ axes:
353331
variables:
354332
ASYNC_RUNTIME: "async-std"
355333

356-
# Note that drivers-evergreen-tools expects `SSL` as the environmental
357-
# variable, not `TLS`, so we have to use that for the actual value used in the
358-
# script; we use `TLS` for the metadata that isn't used by the actual shell
359-
# scripts.
360-
- id: "auth-and-tls"
361-
display_name: Authentication and TLS
362-
values:
363-
- id: "auth-and-tls"
364-
display_name: Auth TLS
365-
variables:
366-
AUTH: "auth"
367-
SSL: "ssl"
368-
369334
- id: "os"
370335
display_name: OS
371336
values:
372-
- id: ubuntu-18.04
373-
display_name: "Ubuntu 18.04"
374-
run_on: ubuntu1804-test
337+
- id: rhel90-dbx-perf-large
338+
display_name: "RHEL 90 (perf)"
339+
run_on: rhel90-dbx-perf-large
375340
variables:
376341
PYTHON: "/opt/mongodbtoolchain/v3/bin/python"
377342
VENV_BIN_DIR: "bin"
378-
# TODO: RUST-990 re-enable macOS benchmarks
379-
# - id: macos-10.14
380-
# display_name: "MacOS 10.14"
381-
# run_on: macos-1014
382-
# variables:
383-
# PYTHON: "/opt/mongodbtoolchain/v3/bin/python"
384-
# VENV_BIN_DIR: "bin"
385-
- id: windows-64-vs2017
386-
display_name: "Windows (VS 2017)"
387-
run_on: windows-64-vs2017-test
388-
variables:
389-
PYTHON: "/cygdrive/c/python/Python36/python"
390-
VENV_BIN_DIR: "Scripts"
391343

392344
buildvariants:
393345
-
394346
matrix_name: "driver benchmarks"
395347
matrix_spec:
396348
os:
397-
- ubuntu-18.04
398-
- windows-64-vs2017
399-
auth-and-tls: "*"
349+
- rhel90-dbx-perf-large
400350
async-runtime: "*"
401-
display_name: "${os} ${auth-and-tls} with ${async-runtime}"
351+
topology: "*"
352+
display_name: "Benchmark ${topology} with ${async-runtime}"
402353
tasks:
403-
- ".rapid"
354+
- ".driver"
404355
-
405356
matrix_name: "bson benchmarks"
406357
matrix_spec:
407358
os:
408-
- ubuntu-18.04
359+
- rhel90-dbx-perf-large
409360
display_name: "BSON Benchmarks"
410361
tasks:
411362
- ".bson"
412363

413364
- matrix_name: "compile-only"
414365
matrix_spec:
415366
os:
416-
- ubuntu-18.04
367+
- rhel90-dbx-perf-large
417368
async-runtime: "*"
418-
display_name: "Compile on ${os} with ${async-runtime}"
369+
display_name: "Compile with ${async-runtime}"
419370
tasks:
420371
- "benchmark-compile"
421372

0 commit comments

Comments
 (0)