Skip to content

Commit 035716a

Browse files
authored
chore(ci): lock mongodb version to 6.0 in tests; add e2e task against latest alpha (#4013)
* chore(ci): lock mongodb version to non-dev 6.0 in tests * chore(ci): add e2e test task for mongodb latest * chore(e2e): fix check in fle tests * chore(e2e): fix version check in kms provider test
1 parent 8ce9b49 commit 035716a

File tree

17 files changed

+243
-169
lines changed

17 files changed

+243
-169
lines changed

.evergreen/buildvariants.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ buildvariants:
7575
- name: test-packaged-app-60x-enterprise
7676
depends_on: package-compass
7777

78+
- name: test-packaged-app-latest
79+
depends_on: package-compass
80+
7881
- name: windows
7982
display_name: Windows 10 (Test and Package)
8083
run_on: windows-vsCurrent-large
@@ -121,6 +124,9 @@ buildvariants:
121124
- name: test-packaged-app-60x-enterprise
122125
depends_on: package-compass
123126

127+
- name: test-packaged-app-latest
128+
depends_on: package-compass
129+
124130
- name: rhel
125131
display_name: RHEL 7.6 (Test and Package)
126132
run_on: rhel76-large
@@ -167,6 +173,10 @@ buildvariants:
167173
- name: test-packaged-app-60x-enterprise
168174
depends_on: package-compass
169175

176+
- name: test-packaged-app-latest
177+
run_on: rhel80-large
178+
depends_on: package-compass
179+
170180
- name: macos
171181
display_name: MacOS x64 11.00 (Test and Package)
172182
run_on: macos-1100

.evergreen/config.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,26 @@
113113
{
114114
"name": "60x-community",
115115
"vars": {
116-
"mongodb_version": "6.x.x"
116+
"mongodb_version": "6.0.x"
117117
}
118118
},
119119
{
120120
"name": "60x-enterprise",
121121
"vars": {
122-
"mongodb_version": "6.x.x",
122+
"mongodb_version": "6.0.x",
123123
"mongodb_use_enterprise": "yes"
124124
}
125+
},
126+
{
127+
"name": "latest",
128+
"vars": {
129+
"mongodb_version": "latest-alpha",
130+
"mongodb_use_enterprise": "yes"
131+
},
132+
"skip_on": ["macos-1100", "macos-1100-arm64"],
133+
"run_on_override": {
134+
"rhel76-large": "rhel80-large"
135+
}
125136
}
126137
]
127138
}

.evergreen/functions.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,13 @@ functions:
370370
eval $(.evergreen/print-compass-env.sh)
371371
source .evergreen/start-docker-envs.sh
372372
373-
echo "Running tests against packaged app at $COMPASS_APP_PATH..."
373+
MONGODB_TYPE="community";
374+
375+
if [[ "$MONGODB_USE_ENTERPRISE" == "yes" ]]; then
376+
MONGODB_TYPE="enterprise"
377+
fi
378+
379+
echo "Running tests against packaged app at $COMPASS_APP_PATH for MongoDB $MONGODB_VERSION ($MONGODB_TYPE)..."
374380
375381
if [[ "$IS_OSX" == "true" ]]; then
376382
echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/BUILD-14458)"

.evergreen/print-compass-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
export MONGODB_DEFAULT_VERSION=6.x.x
5+
export MONGODB_DEFAULT_VERSION=6.0.x
66

77
if [[ $OSTYPE == "cygwin" ]]; then
88
export PLATFORM='win32'

.evergreen/tasks.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ tasks:
321321
compass_distribution: compass
322322
- func: test-packaged-app
323323
vars:
324-
mongodb_version: '6.x.x'
324+
mongodb_version: '6.0.x'
325325
compass_distribution: compass
326326
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
327327

@@ -341,7 +341,28 @@ tasks:
341341
compass_distribution: compass
342342
- func: test-packaged-app
343343
vars:
344-
mongodb_version: '6.x.x'
344+
mongodb_version: '6.0.x'
345+
mongodb_use_enterprise: 'yes'
346+
compass_distribution: compass
347+
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
348+
349+
- name: test-packaged-app-latest
350+
tags: ['required-for-publish', 'run-on-pr']
351+
commands:
352+
- func: prepare
353+
- func: install
354+
- func: bootstrap
355+
vars:
356+
scope: 'compass-e2e-tests'
357+
- func: apply-compass-target-expansion
358+
vars:
359+
compass_distribution: compass
360+
- func: get-packaged-app
361+
vars:
362+
compass_distribution: compass
363+
- func: test-packaged-app
364+
vars:
365+
mongodb_version: 'latest-alpha'
345366
mongodb_use_enterprise: 'yes'
346367
compass_distribution: compass
347368
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

0 commit comments

Comments
 (0)