chore: use new mongodb-runner in place of custom test server script C…

…OMPASS-6942 (#4623)
mongodb-js · Jul 12, 2023 · 7916184 · 7916184
1 parent 407a1a0
commit 7916184
Show file tree

Hide file tree

Showing 43 changed files with 683 additions and 2,937 deletions.
diff --git a/.evergreen/config.json b/.evergreen/config.json
@@ -53,8 +53,7 @@
         {
           "name": "40x-enterprise",
           "vars": {
-            "mongodb_version": "4.0.x",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "4.0.x-enterprise"
           },
           "skip_on": ["macos-1100", "macos-1100-arm64"],
           "//": "MongoDB 4.0 / 4.2 Enterprise doesn't work on Ubuntu 20.04 without additional dependencies installed, it's easier to use an older machine than install missing dependencies as machines we are using are stateful",
@@ -72,8 +71,7 @@
         {
           "name": "42x-enterprise",
           "vars": {
-            "mongodb_version": "4.2.x",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "4.2.x-enterprise"
           },
           "skip_on": ["macos-1100", "macos-1100-arm64"],
           "run_on_override": {
@@ -90,8 +88,7 @@
         {
           "name": "44x-enterprise",
           "vars": {
-            "mongodb_version": "4.4.x",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "4.4.x-enterprise"
           },
           "skip_on": ["macos-1100", "macos-1100-arm64"]
         },
@@ -105,8 +102,7 @@
         {
           "name": "5x-enterprise",
           "vars": {
-            "mongodb_version": "5.x.x",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "5.x.x-enterprise"
           },
           "skip_on": ["macos-1100", "macos-1100-arm64"]
         },
@@ -119,15 +115,13 @@
         {
           "name": "60x-enterprise",
           "vars": {
-            "mongodb_version": "6.0.x",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "6.0.x-enterprise"
           }
         },
         {
           "name": "latest",
           "vars": {
-            "mongodb_version": "latest-alpha",
-            "mongodb_use_enterprise": "yes"
+            "mongodb_version": "latest-alpha-enterprise"
           },
           "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
         }

diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml
@@ -72,6 +72,7 @@ variables:
     DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${aws_secret_evergreen_integrations}
     EVERGREEN_BUCKET_NAME: mciuploads
     EVERGREEN_BUCKET_KEY_PREFIX: ${project}/${revision}_${revision_order_id}
+    MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
 
 # This is here with the variables because anchors aren't supported across includes
 post:
@@ -199,7 +200,7 @@ functions:
           <<: *compass-env
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
+          MONGODB_RUNNER_VERSION: ${mongodb_version|}
         script: |
           set -e
 
@@ -225,7 +226,7 @@ functions:
           <<: *compass-env
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
+          MONGODB_RUNNER_VERSION: ${mongodb_version|}
         script: |
           set -e
 
@@ -352,7 +353,7 @@ functions:
           <<: *compass-env
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
+          MONGODB_RUNNER_VERSION: ${mongodb_version|}
         script: |
           set -e
           # Load environment variables
@@ -376,20 +377,14 @@ functions:
           COMPASS_APP_NAME: ${packagerOptions.name}
           DEBUG: ${debug|}
           MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
+          MONGODB_RUNNER_VERSION: ${mongodb_version|}
         script: |
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
           source .evergreen/start-docker-envs.sh
 
-          MONGODB_TYPE="community";
-
-          if [[ "$MONGODB_USE_ENTERPRISE" == "yes" ]]; then
-            MONGODB_TYPE="enterprise"
-          fi
-
-          echo "Running tests against packaged app at $COMPASS_APP_PATH for MongoDB $MONGODB_VERSION ($MONGODB_TYPE)..."
+          echo "Running tests against packaged app at $COMPASS_APP_PATH for MongoDB $MONGODB_VERSION..."
 
           if [[ "$IS_OSX" == "true" ]]; then
             echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/BUILD-14458)"

diff --git a/.evergreen/print-compass-env.js b/.evergreen/print-compass-env.js
@@ -104,7 +104,6 @@ function printCompassEnv() {
   printVar('IS_UBUNTU', process.env.IS_UBUNTU);
   printVar('DEBUG', process.env.DEBUG);
   printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
-  printVar('MONGODB_USE_ENTERPRISE', process.env.MONGODB_USE_ENTERPRISE);
 }
 
 printCompassEnv();
diff --git a/.evergreen/tasks.yml b/.evergreen/tasks.yml
@@ -187,8 +187,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '4.0.x'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: '4.0.x-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -228,8 +227,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '4.2.x'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: '4.2.x-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -269,8 +267,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '4.4.x'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: '4.4.x-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -310,8 +307,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '5.x.x'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: '5.x.x-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -351,8 +347,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '6.0.x'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: '6.0.x-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -372,7 +367,6 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: 'latest-alpha'
-          mongodb_use_enterprise: 'yes'
+          mongodb_version: 'latest-alpha-enterprise'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
diff --git a/.gitignore b/.gitignore
@@ -33,5 +33,4 @@ mongodb-crypt
 packages/*/.npmrc
 config/*/.npmrc
 .sbom
-.testserver
 .evergreen/logs