Merge remote-tracking branch 'origin/main' into 1.35-releases

Author: addaleax

.evergreen/buildvariants.yml

@@ -75,6 +75,9 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         depends_on: package-compass
 
+      - name: test-packaged-app-latest
+        depends_on: package-compass
+
   - name: windows
     display_name: Windows 10 (Test and Package)
     run_on: windows-vsCurrent-large
@@ -121,6 +124,9 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         depends_on: package-compass
 
+      - name: test-packaged-app-latest
+        depends_on: package-compass
+
   - name: rhel
     display_name: RHEL 7.6 (Test and Package)
     run_on: rhel76-large

.evergreen/config.json

@@ -113,15 +113,23 @@
         {
           "name": "60x-community",
           "vars": {
-            "mongodb_version": "6.x.x"
+            "mongodb_version": "6.0.x"
           }
         },
         {
           "name": "60x-enterprise",
           "vars": {
-            "mongodb_version": "6.x.x",
+            "mongodb_version": "6.0.x",
             "mongodb_use_enterprise": "yes"
           }
+        },
+        {
+          "name": "latest",
+          "vars": {
+            "mongodb_version": "latest-alpha",
+            "mongodb_use_enterprise": "yes"
+          },
+          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
         }
       ]
     }

.evergreen/functions.yml

@@ -119,10 +119,15 @@ functions:
           .evergreen/preinstall.sh
 
           # Make sure install worked
-          echo "node -v";
+          echo "Using node version:";
           node -v;
-          echo "npm -v";
+          echo "Using npm version:";
           npm -v;
+          
+          echo "Using gcc version:"
+          gcc --version;
+          echo "Using g++ version:"
+          g++ --version;
 
   install:
     - command: shell.exec
@@ -365,7 +370,13 @@ functions:
           eval $(.evergreen/print-compass-env.sh)
           source .evergreen/start-docker-envs.sh
 
-          echo "Running tests against packaged app at $COMPASS_APP_PATH..."
+          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)..."
 
           if [[ "$IS_OSX" == "true" ]]; then
             echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/BUILD-14458)"

.evergreen/print-compass-env.js

@@ -67,14 +67,12 @@ function printCompassEnv() {
     pathsToPrepend.unshift(`${newPWD}/.deps/bin`);
   }
 
-  if (process.env.IS_RHEL === 'true') {
-    // To build node modules on RHEL post electron 13 we need
+  if (process.env.PLATFORM === 'linux') {
+    // To build node modules on linux post electron 13 we need
     // a newer c++ compiler version, this adds it.
     // https://jira.mongodb.org/browse/COMPASS-5150
     pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');
-  }
 
-  if (process.env.PLATFORM === 'linux') {
     // Make sure that linux is using python 3.6 (node-gyp requirement)
     pathsToPrepend.unshift('/opt/python/3.6/bin');
   }

.evergreen/print-compass-env.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-export MONGODB_DEFAULT_VERSION=6.x.x
+export MONGODB_DEFAULT_VERSION=6.0.x
 
 if [[ $OSTYPE == "cygwin" ]]; then
     export PLATFORM='win32'

.evergreen/tasks.yml

@@ -321,7 +321,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '6.x.x'
+          mongodb_version: '6.0.x'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
@@ -341,7 +341,28 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars: 
-          mongodb_version: '6.x.x'
+          mongodb_version: '6.0.x'
+          mongodb_use_enterprise: 'yes'
+          compass_distribution: compass
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+
+  - name: test-packaged-app-latest
+    tags: ['required-for-publish', 'run-on-pr']
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars: 
+          mongodb_version: 'latest-alpha'
           mongodb_use_enterprise: 'yes'
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

THIRD-PARTY-NOTICES.md

@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@electron/remote": "^2.0.8",
+    "@electron/remote": "^2.0.9",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "chai": "^4.3.4",
     "chai-dom": "^1.9.0",

configs/mocha-config-compass/package.json

@@ -74,7 +74,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^15.5.7",
+    "electron": "^22.0.2",
     "html-webpack-plugin": "^5.3.2",
     "less-loader": "^10.0.1",
     "mini-css-extract-plugin": "^2.3.0",