Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): account for 8.0.0 publish COMPASS-8087 #6283

Merged
merged 1 commit into from
Sep 25, 2024
Merged

chore(ci): account for 8.0.0 publish COMPASS-8087 #6283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .evergreen/buildvariants-and-tasks.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ const MAINTAINED_SERVER_VERSIONS = [
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
{ name: '70x-community', version: '7.0.x' },
{ name: '70x-enterprise', version: '7.0.x-enterprise' },
{ name: '80x-community', version: '8.0.0-rc18' },
{ name: '80x-enterprise', version: '8.0.0-rc18-enterprise' },
{ name: '80x-community', version: '8.0.x' },
{ name: '80x-enterprise', version: '8.0.x-enterprise' },
];

const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };
Expand Down Expand Up @@ -281,7 +281,7 @@ tasks:
- func: check

- name: test
tags:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
Expand Down
12 changes: 6 additions & 6 deletions .evergreen/buildvariants-and-tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1314,7 +1314,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1337,7 +1337,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand All @@ -1360,7 +1360,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1383,7 +1383,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1406,7 +1406,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ functions:
eval $(.evergreen/print-compass-env.sh)
rm -rf mongodb-crypt && mkdir -p mongodb-crypt
(cd mongodb-crypt && \
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 8.0.0-rc18') | \
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version continuous) | \
tar -xvz)
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
npm run test-csfle --workspace mongodb-data-service
Expand Down
6 changes: 2 additions & 4 deletions packages/compass/scripts/download-csfle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ const CSFLE_DIRECTORY = path.resolve(PACKAGE_ROOT, 'src', 'deps', 'csfle');
const downloadOptions = {
enterprise: true,
crypt_shared: true,
// TODO(MONGOSH-1833): The current 'continuous' release is not compatible with 8.x rc server releases. So we are using
// 8.0.0-rc18 (current latest) for now and once 8.0 is released we should switch back to continuous.
version: '8.0.0-rc18',
version: 'continuous',
};
if (process.platform === 'linux') {
// The CSFLE shared library is built for different distros,
Expand All @@ -49,7 +47,7 @@ const CSFLE_DIRECTORY = path.resolve(PACKAGE_ROOT, 'src', 'deps', 'csfle');

const { downloadedBinDir, version } = await downloadMongoDbWithVersionInfo(
CACHE_DIR,
'8.0.0-rc18',
'continuous',
downloadOptions
);
await fs.mkdir(CSFLE_DIRECTORY, { recursive: true });
Expand Down
Loading