From 9baf39420604e07718ad955b1a17ab10d1bbd1bc Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Thu, 31 Oct 2024 16:36:09 -0400 Subject: [PATCH 1/2] chore: set DRIVERS_TOOLS for benchmarks --- .evergreen/config.in.yml | 1 + .evergreen/config.yml | 1 + .evergreen/run-benchmarks.sh | 4 ++++ test/benchmarks/driverBench/index.js | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index a753f8f6462..fa4884a05ba 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1102,6 +1102,7 @@ functions: env: PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} MONGODB_URI: ${MONGODB_URI} + DRIVERS_TOOLS: ${DRIVERS_TOOLS} binary: bash args: - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh diff --git a/.evergreen/config.yml b/.evergreen/config.yml index edd93358090..01306ba9bc8 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1064,6 +1064,7 @@ functions: env: PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} MONGODB_URI: ${MONGODB_URI} + DRIVERS_TOOLS: ${DRIVERS_TOOLS} binary: bash args: - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh diff --git a/.evergreen/run-benchmarks.sh b/.evergreen/run-benchmarks.sh index b26c2afa21a..52201032813 100644 --- a/.evergreen/run-benchmarks.sh +++ b/.evergreen/run-benchmarks.sh @@ -1,5 +1,9 @@ #! /bin/bash +set -o errexit +set -o xtrace +set -o nounset + source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh export MONGODB_URI=$MONGODB_URI diff --git a/test/benchmarks/driverBench/index.js b/test/benchmarks/driverBench/index.js index 0b1986455b9..bd465ad5aa0 100644 --- a/test/benchmarks/driverBench/index.js +++ b/test/benchmarks/driverBench/index.js @@ -22,7 +22,9 @@ const systemInfo = () => `- cores: ${platform.cores}`, `- arch: ${os.arch()}`, `- os: ${process.platform} (${os.release()})`, - `- ram: ${platform.ram}\n` + `- ram: ${platform.ram}`, + `- bson: ${require('bson/package.json').version}`, + `- node: ${process.version}\n` ].join('\n'); console.log(systemInfo()); From fb7a0c3f6be9eedf87ad81e0bd4f82c724ee5e40 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Thu, 31 Oct 2024 16:44:21 -0400 Subject: [PATCH 2/2] rm bson version --- test/benchmarks/driverBench/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/benchmarks/driverBench/index.js b/test/benchmarks/driverBench/index.js index bd465ad5aa0..5b343cb2be1 100644 --- a/test/benchmarks/driverBench/index.js +++ b/test/benchmarks/driverBench/index.js @@ -23,7 +23,6 @@ const systemInfo = () => `- arch: ${os.arch()}`, `- os: ${process.platform} (${os.release()})`, `- ram: ${platform.ram}`, - `- bson: ${require('bson/package.json').version}`, `- node: ${process.version}\n` ].join('\n'); console.log(systemInfo());