Skip to content

Commit

Permalink
test: remove mongosh integration tests (#3850)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbbeeken authored Oct 19, 2023
1 parent 32b7176 commit e1c8c3b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 267 deletions.
37 changes: 0 additions & 37 deletions .evergreen/config.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -411,43 +411,6 @@ functions:
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh"

###########################################
# mongosh functions
###########################################
"compile mongosh":
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"

"run mongosh tests for package":
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"

"run mongosh package scope test":
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh"

"reset aws instance profile":
- command: shell.exec
params:
Expand Down
133 changes: 0 additions & 133 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,37 +370,6 @@ functions:
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh
compile mongosh:
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
run mongosh tests for package:
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
run mongosh package scope test:
- command: subprocess.exec
params:
working_dir: src
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
TASK_ID: ${task_id}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh
reset aws instance profile:
- command: shell.exec
params:
Expand Down Expand Up @@ -3843,96 +3812,6 @@ tasks:
- func: bootstrap mongo-orchestration
- func: bootstrap kms servers
- func: run tests
- name: run-mongosh-browser-runtime-electron
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: browser-runtime-electron
- name: run-mongosh-cli-repl
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: cli-repl
- name: run-mongosh-connectivity-tests
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: connectivity-tests
- name: run-mongosh-mongosh
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: mongosh
- name: run-mongosh-node-runtime-worker-thread
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: node-runtime-worker-thread
- name: run-mongosh-service-provider-server
tags:
- run-mongosh-integration-tests
depends_on: compile-mongosh
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh tests for package
vars:
mongosh_package: service-provider-server
- name: compile-mongosh
tags:
- run-mongosh-integration-tests
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: compile mongosh
- name: verify-mongosh-scopes
tags:
- run-mongosh-integration-tests
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
NPM_VERSION: 9
- func: run mongosh package scope test
task_groups:
- name: serverless_task_group
setup_group_can_fail_task: true
Expand Down Expand Up @@ -4515,18 +4394,6 @@ buildvariants:
run_on: rhel80-large
tasks:
- download-and-merge-coverage
- name: mongosh_integration_tests
display_name: mongosh integration tests
run_on: ubuntu1804-large
tasks:
- run-mongosh-browser-runtime-electron
- run-mongosh-cli-repl
- run-mongosh-connectivity-tests
- run-mongosh-mongosh
- run-mongosh-node-runtime-worker-thread
- run-mongosh-service-provider-server
- compile-mongosh
- verify-mongosh-scopes
- name: ubuntu1804-test-mongodb-aws
display_name: MONGODB-AWS Auth test
run_on: ubuntu1804-large
Expand Down
49 changes: 19 additions & 30 deletions .evergreen/generate_evergreen_tasks.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const fs = require('fs');
const yaml = require('js-yaml');
const semver = require('semver');
const { mongoshTasks } = require('./generate_mongosh_tasks');

const {
MONGODB_VERSIONS,
Expand Down Expand Up @@ -489,22 +488,24 @@ BUILD_VARIANTS.push({
tasks: ['test-rapid-server']
});

const unitTestTasks = Array.from((function* () {
for (const { versionNumber: NODE_LTS_VERSION, npmVersion: NPM_VERSION } of versions) {
yield {
name: `run-unit-tests-node-${NODE_LTS_VERSION}`,
tags: ['unit-tests'],
commands: [
updateExpansions({
NODE_LTS_VERSION,
NPM_VERSION
}),
{ func: 'install dependencies' },
{ func: 'run unit tests' }
]
const unitTestTasks = Array.from(
(function* () {
for (const { versionNumber: NODE_LTS_VERSION, npmVersion: NPM_VERSION } of versions) {
yield {
name: `run-unit-tests-node-${NODE_LTS_VERSION}`,
tags: ['unit-tests'],
commands: [
updateExpansions({
NODE_LTS_VERSION,
NPM_VERSION
}),
{ func: 'install dependencies' },
{ func: 'run unit tests' }
]
};
}
}
})())
})()
);

// singleton build variant for linting
SINGLETON_TASKS.push(
Expand Down Expand Up @@ -577,11 +578,7 @@ BUILD_VARIANTS.push({
name: 'lint',
display_name: 'lint',
run_on: DEFAULT_OS,
tasks: [
'.unit-tests',
'.lint-checks',
'.typescript-compilation'
]
tasks: ['.unit-tests', '.lint-checks', '.typescript-compilation']
});

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

BUILD_VARIANTS.push({
name: 'mongosh_integration_tests',
display_name: 'mongosh integration tests',
run_on: UBUNTU_OS,
tasks: mongoshTasks.map(({ name }) => name)
});

// special case for MONGODB-AWS authentication
BUILD_VARIANTS.push({
name: 'ubuntu1804-test-mongodb-aws',
Expand Down Expand Up @@ -770,8 +760,7 @@ fileData.tasks = (fileData.tasks || [])
.concat(SINGLETON_TASKS)
.concat(AUTH_DISABLED_TASKS)
.concat(AWS_LAMBDA_HANDLER_TASKS)
.concat(MONGOCRYPTD_CSFLE_TASKS)
.concat(mongoshTasks);
.concat(MONGOCRYPTD_CSFLE_TASKS);

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

Expand Down
67 changes: 0 additions & 67 deletions .evergreen/generate_mongosh_tasks.js

This file was deleted.

0 comments on commit e1c8c3b

Please sign in to comment.