Skip to content

Commit e1c8c3b

Browse files
nbbeekennbbeeken
authored
test: remove mongosh integration tests (#3850)
1 parent 32b7176 commit e1c8c3b

File tree

4 files changed

+19
-267
lines changed

4 files changed

+19
-267
lines changed

‎.evergreen/config.in.yml

-37
Original file line numberDiff line numberDiff line change
@@ -411,43 +411,6 @@ functions:
411411
args:
412412
- "${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh"
413413

414-
###########################################
415-
# mongosh functions
416-
###########################################
417-
"compile mongosh":
418-
- command: subprocess.exec
419-
params:
420-
working_dir: src
421-
env:
422-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
423-
TASK_ID: ${task_id}
424-
binary: bash
425-
args:
426-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
427-
428-
"run mongosh tests for package":
429-
- command: subprocess.exec
430-
params:
431-
working_dir: src
432-
env:
433-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
434-
TASK_ID: ${task_id}
435-
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
436-
binary: bash
437-
args:
438-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
439-
440-
"run mongosh package scope test":
441-
- command: subprocess.exec
442-
params:
443-
working_dir: src
444-
env:
445-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
446-
TASK_ID: ${task_id}
447-
binary: bash
448-
args:
449-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh"
450-
451414
"reset aws instance profile":
452415
- command: shell.exec
453416
params:

‎.evergreen/config.yml

-133
Original file line numberDiff line numberDiff line change
@@ -370,37 +370,6 @@ functions:
370370
binary: bash
371371
args:
372372
- ${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh
373-
compile mongosh:
374-
- command: subprocess.exec
375-
params:
376-
working_dir: src
377-
env:
378-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
379-
TASK_ID: ${task_id}
380-
binary: bash
381-
args:
382-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
383-
run mongosh tests for package:
384-
- command: subprocess.exec
385-
params:
386-
working_dir: src
387-
env:
388-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
389-
TASK_ID: ${task_id}
390-
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
391-
binary: bash
392-
args:
393-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
394-
run mongosh package scope test:
395-
- command: subprocess.exec
396-
params:
397-
working_dir: src
398-
env:
399-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
400-
TASK_ID: ${task_id}
401-
binary: bash
402-
args:
403-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh
404373
reset aws instance profile:
405374
- command: shell.exec
406375
params:
@@ -3843,96 +3812,6 @@ tasks:
38433812
- func: bootstrap mongo-orchestration
38443813
- func: bootstrap kms servers
38453814
- func: run tests
3846-
- name: run-mongosh-browser-runtime-electron
3847-
tags:
3848-
- run-mongosh-integration-tests
3849-
depends_on: compile-mongosh
3850-
commands:
3851-
- func: install dependencies
3852-
vars:
3853-
NODE_LTS_VERSION: 16
3854-
NPM_VERSION: 9
3855-
- func: run mongosh tests for package
3856-
vars:
3857-
mongosh_package: browser-runtime-electron
3858-
- name: run-mongosh-cli-repl
3859-
tags:
3860-
- run-mongosh-integration-tests
3861-
depends_on: compile-mongosh
3862-
commands:
3863-
- func: install dependencies
3864-
vars:
3865-
NODE_LTS_VERSION: 16
3866-
NPM_VERSION: 9
3867-
- func: run mongosh tests for package
3868-
vars:
3869-
mongosh_package: cli-repl
3870-
- name: run-mongosh-connectivity-tests
3871-
tags:
3872-
- run-mongosh-integration-tests
3873-
depends_on: compile-mongosh
3874-
commands:
3875-
- func: install dependencies
3876-
vars:
3877-
NODE_LTS_VERSION: 16
3878-
NPM_VERSION: 9
3879-
- func: run mongosh tests for package
3880-
vars:
3881-
mongosh_package: connectivity-tests
3882-
- name: run-mongosh-mongosh
3883-
tags:
3884-
- run-mongosh-integration-tests
3885-
depends_on: compile-mongosh
3886-
commands:
3887-
- func: install dependencies
3888-
vars:
3889-
NODE_LTS_VERSION: 16
3890-
NPM_VERSION: 9
3891-
- func: run mongosh tests for package
3892-
vars:
3893-
mongosh_package: mongosh
3894-
- name: run-mongosh-node-runtime-worker-thread
3895-
tags:
3896-
- run-mongosh-integration-tests
3897-
depends_on: compile-mongosh
3898-
commands:
3899-
- func: install dependencies
3900-
vars:
3901-
NODE_LTS_VERSION: 16
3902-
NPM_VERSION: 9
3903-
- func: run mongosh tests for package
3904-
vars:
3905-
mongosh_package: node-runtime-worker-thread
3906-
- name: run-mongosh-service-provider-server
3907-
tags:
3908-
- run-mongosh-integration-tests
3909-
depends_on: compile-mongosh
3910-
commands:
3911-
- func: install dependencies
3912-
vars:
3913-
NODE_LTS_VERSION: 16
3914-
NPM_VERSION: 9
3915-
- func: run mongosh tests for package
3916-
vars:
3917-
mongosh_package: service-provider-server
3918-
- name: compile-mongosh
3919-
tags:
3920-
- run-mongosh-integration-tests
3921-
commands:
3922-
- func: install dependencies
3923-
vars:
3924-
NODE_LTS_VERSION: 16
3925-
NPM_VERSION: 9
3926-
- func: compile mongosh
3927-
- name: verify-mongosh-scopes
3928-
tags:
3929-
- run-mongosh-integration-tests
3930-
commands:
3931-
- func: install dependencies
3932-
vars:
3933-
NODE_LTS_VERSION: 16
3934-
NPM_VERSION: 9
3935-
- func: run mongosh package scope test
39363815
task_groups:
39373816
- name: serverless_task_group
39383817
setup_group_can_fail_task: true
@@ -4515,18 +4394,6 @@ buildvariants:
45154394
run_on: rhel80-large
45164395
tasks:
45174396
- download-and-merge-coverage
4518-
- name: mongosh_integration_tests
4519-
display_name: mongosh integration tests
4520-
run_on: ubuntu1804-large
4521-
tasks:
4522-
- run-mongosh-browser-runtime-electron
4523-
- run-mongosh-cli-repl
4524-
- run-mongosh-connectivity-tests
4525-
- run-mongosh-mongosh
4526-
- run-mongosh-node-runtime-worker-thread
4527-
- run-mongosh-service-provider-server
4528-
- compile-mongosh
4529-
- verify-mongosh-scopes
45304397
- name: ubuntu1804-test-mongodb-aws
45314398
display_name: MONGODB-AWS Auth test
45324399
run_on: ubuntu1804-large

‎.evergreen/generate_evergreen_tasks.js

+19-30
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const fs = require('fs');
22
const yaml = require('js-yaml');
33
const semver = require('semver');
4-
const { mongoshTasks } = require('./generate_mongosh_tasks');
54

65
const {
76
MONGODB_VERSIONS,
@@ -489,22 +488,24 @@ BUILD_VARIANTS.push({
489488
tasks: ['test-rapid-server']
490489
});
491490

492-
const unitTestTasks = Array.from((function* () {
493-
for (const { versionNumber: NODE_LTS_VERSION, npmVersion: NPM_VERSION } of versions) {
494-
yield {
495-
name: `run-unit-tests-node-${NODE_LTS_VERSION}`,
496-
tags: ['unit-tests'],
497-
commands: [
498-
updateExpansions({
499-
NODE_LTS_VERSION,
500-
NPM_VERSION
501-
}),
502-
{ func: 'install dependencies' },
503-
{ func: 'run unit tests' }
504-
]
491+
const unitTestTasks = Array.from(
492+
(function* () {
493+
for (const { versionNumber: NODE_LTS_VERSION, npmVersion: NPM_VERSION } of versions) {
494+
yield {
495+
name: `run-unit-tests-node-${NODE_LTS_VERSION}`,
496+
tags: ['unit-tests'],
497+
commands: [
498+
updateExpansions({
499+
NODE_LTS_VERSION,
500+
NPM_VERSION
501+
}),
502+
{ func: 'install dependencies' },
503+
{ func: 'run unit tests' }
504+
]
505+
};
505506
}
506-
}
507-
})())
507+
})()
508+
);
508509

509510
// singleton build variant for linting
510511
SINGLETON_TASKS.push(
@@ -577,11 +578,7 @@ BUILD_VARIANTS.push({
577578
name: 'lint',
578579
display_name: 'lint',
579580
run_on: DEFAULT_OS,
580-
tasks: [
581-
'.unit-tests',
582-
'.lint-checks',
583-
'.typescript-compilation'
584-
]
581+
tasks: ['.unit-tests', '.lint-checks', '.typescript-compilation']
585582
});
586583

587584
BUILD_VARIANTS.push({
@@ -591,13 +588,6 @@ BUILD_VARIANTS.push({
591588
tasks: ['download-and-merge-coverage']
592589
});
593590

594-
BUILD_VARIANTS.push({
595-
name: 'mongosh_integration_tests',
596-
display_name: 'mongosh integration tests',
597-
run_on: UBUNTU_OS,
598-
tasks: mongoshTasks.map(({ name }) => name)
599-
});
600-
601591
// special case for MONGODB-AWS authentication
602592
BUILD_VARIANTS.push({
603593
name: 'ubuntu1804-test-mongodb-aws',
@@ -770,8 +760,7 @@ fileData.tasks = (fileData.tasks || [])
770760
.concat(SINGLETON_TASKS)
771761
.concat(AUTH_DISABLED_TASKS)
772762
.concat(AWS_LAMBDA_HANDLER_TASKS)
773-
.concat(MONGOCRYPTD_CSFLE_TASKS)
774-
.concat(mongoshTasks);
763+
.concat(MONGOCRYPTD_CSFLE_TASKS);
775764

776765
fileData.buildvariants = (fileData.buildvariants || []).concat(BUILD_VARIANTS);
777766

‎.evergreen/generate_mongosh_tasks.js

-67
This file was deleted.

0 commit comments

Comments
 (0)