Skip to content

Commit 684002c

Browse files
authored
chore: migrate towards mongodb-runner MONGOSH-1490 (#1513)
1 parent f4ad4c9 commit 684002c

28 files changed

+503
-660
lines changed

.evergreen.yml

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

.evergreen/evergreen.yml.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const MONGODB_VERSIONS = [
1616
{ shortName: '50xe', versionSpec: '5.0.x' },
1717
{ shortName: '60xc', versionSpec: '6.0.x-community' },
1818
{ shortName: '60xe', versionSpec: '6.0.x' },
19-
{ shortName: 'latest', versionSpec: 'latest-alpha' }
19+
{ shortName: 'latest', versionSpec: 'latest-alpha-enterprise' }
2020
];
2121
const NODE_VERSIONS = [
2222
{ shortName: '16', versionSpec: NODE_JS_VERSION_16, skipNodeVersionCheck: '' },
@@ -810,7 +810,7 @@ tasks:
810810
- func: test_apistrict
811811
vars:
812812
node_js_version: "<% out(NODE_JS_VERSION_16) %>"
813-
mongosh_server_test_version: "latest-alpha"
813+
mongosh_server_test_version: "latest-alpha-enterprise"
814814
mongosh_test_force_api_strict: "1"
815815
- name: compile_artifact
816816
depends_on:
@@ -864,7 +864,7 @@ tasks:
864864
- func: run_e2e_tests
865865
vars:
866866
node_js_version: "<% out(NODE_JS_VERSION_16) %>"
867-
mongosh_server_test_version: "<% out(mVersion) %>"
867+
mongosh_server_test_version: "<% out(mVersion) %>-enterprise"
868868
mongosh_test_e2e_force_fips: "<% out(fipsVariant === 'fips' ? '1' : '') %>"
869869
<% } } } %>
870870

.evergreen/setup-env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set -x
33
export BASEDIR="$PWD/.evergreen"
44
export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-8/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH"
55
export IS_MONGOSH_EVERGREEN_CI=1
6+
export DEBUG="mongodb*,$DEBUG"
67

78
if [ "$OS" != "Windows_NT" ]; then
89
if which realpath; then # No realpath on macOS, but also not needed there

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ variable. For detailed instructions for each of our supported platforms, please
101101
### Requirements
102102

103103
- Node.js v16.x
104-
- Python 3.x
105-
- The test suite uses [mlaunch](http://blog.rueckstiess.com/mtools/mlaunch.html)
106-
for managing running mongod, you can install that manually as well via
107-
`pip3 install mtools[mlaunch]` if the automatic installation causes any trouble.
108104

109105
### Install
110106

package-lock.json

Lines changed: 137 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
"predepcheck": "npm run depalign",
2121
"depcheck": "lerna run --stream depcheck",
2222
"lint": "lerna run lint",
23-
"clear-mlaunch": "ts-node -P configs/tsconfig-mongosh/tsconfig.common.json -r ./scripts/import-expansions scripts/clear-mlaunch",
24-
"install-mlaunch": "ts-node -P configs/tsconfig-mongosh/tsconfig.common.json -r ./scripts/import-expansions scripts/install-mlaunch",
25-
"pretest": "npm run clear-mlaunch && npm run install-mlaunch",
26-
"pretest-ci": "npm run clear-mlaunch -- --killAllMongod && npm run install-mlaunch",
27-
"pretest-e2e-ci": "npm run clear-mlaunch -- --killAllMongod && npm run install-mlaunch",
28-
"posttest": "npm run clear-mlaunch",
29-
"posttest-ci": "npm run clear-mlaunch -- --killAllMongod",
30-
"posttest-e2e-ci": "npm run clear-mlaunch -- --killAllMongod",
3123
"test": "rimraf .nyc_output && lerna exec -- nyc --no-clean --cwd ../.. --reporter=none npm run test && npm run report-coverage",
3224
"test-ci": "rimraf .nyc_output && lerna exec -- nyc --no-clean --cwd ../.. --reporter=none npm run test-ci && npm run post-process-nyc",
3325
"test-ci-nocoverage": "lerna exec -- npm run test-ci",
@@ -116,6 +108,7 @@
116108
"lerna": "^4.0.0",
117109
"mocha": "^10.2.0",
118110
"mongodb": "^5.7.0",
111+
"mongodb-runner": "^5.4.4",
119112
"node-gyp": "^9.0.0",
120113
"nyc": "^15.1.0",
121114
"pkg-up": "^3.1.0",

packages/build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
},
5959
"dependencies": {
6060
"@mongodb-js/devtools-github-repo": "^1.0.1",
61+
"@mongodb-js/mongodb-downloader": "^0.2.7",
6162
"@mongodb-js/dl-center": "^1.0.1",
6263
"@octokit/rest": "^17.9.0",
6364
"aws-sdk": "^2.674.0",
6465
"boxednode": "^2.0.1",
6566
"command-exists": "^1.2.9",
6667
"download": "^8.0.0",
6768
"es-aggregate-error": "^1.0.9",
68-
"mongodb-download-url": "^1.3.0",
6969
"nock": "^13.0.11",
7070
"node-fetch": "^2.6.1",
7171
"pkg-up": "^3.1.0",

0 commit comments

Comments
 (0)