Skip to content

Commit 1084668

Browse files
committed
Use setup-env
1 parent 883411c commit 1084668

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.evergreen/run-e2e-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ fi
2323

2424
echo "TEST NAME IS $E2E_TASK_NAME"
2525
echo "$MONGOSH_TEST_EXECUTABLE_PATH"
26-
E2E_TASK_NAME=${E2E_TASK_NAME} npm run test-e2e
26+
npm run test-e2e

.evergreen/setup-env.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
77
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
88
export IS_MONGOSH_EVERGREEN_CI=1
99
export DEBUG="mongodb*,$DEBUG"
10+
export TASK_NAME="$E2E_TASK_NAME"
1011

1112
if [ "$OS" != "Windows_NT" ]; then
12-
if which realpath; then # No realpath on macOS, but also not needed there
13+
if which realpath; then # No realpath on macOS, but also not needed there
1314
export HOME="$(realpath "$HOME")" # Needed to de-confuse nvm when /home is a symlink
1415
fi
1516
export NVM_DIR="$BASEDIR/.nvm"
@@ -69,6 +70,9 @@ fi
6970
echo "Running on:"
7071
uname -a
7172

73+
echo "Running task"
74+
echo $TASK_NAME
75+
7276
echo "Full path:"
7377
echo $PATH
7478

packages/e2e-tests/reporter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const XUnit = reporters.XUnit;
99
export class MochaReporter extends reporters.Base {
1010
constructor(runner: Runner, options: MochaOptions) {
1111
super(runner, options);
12-
const suiteName = process.env.E2E_TASK_NAME ?? path.basename(process.cwd());
12+
const suiteName = process.env.TASK_NAME ?? path.basename(process.cwd());
1313
console.info(`MOCHAREPORTER:${suiteName}`);
1414

1515
new Spec(runner);

0 commit comments

Comments
 (0)