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): reorganize evergreen configuration for unit tests #2306

Merged
merged 12 commits into from
Dec 20, 2024
+510 −411
Merged

chore(ci): reorganize evergreen configuration for unit tests #2306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4f56224
fix test_coverage
gagik Dec 18, 2024
2fbd4af
add explicit definition of dependencies
gagik Dec 18, 2024
36e250a
use the correct local file
gagik Dec 18, 2024
bfcb7d4
temporarily only test ubuntu runs
gagik Dec 19, 2024
060978d
add the linux builds...
gagik Dec 19, 2024
21f2fe4
make it run only for cli_repl for now
gagik Dec 19, 2024
98a700b
update to include tests prefix
gagik Dec 19, 2024
80e4b93
use variant.name
gagik Dec 20, 2024
a6fc40e
run on all files
gagik Dec 20, 2024
a45674a
move unit tests and cleanup
gagik Dec 18, 2024
2b26724
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/move-…
gagik Dec 20, 2024
8d30c44
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/move-…
gagik Dec 20, 2024
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
1 change: 1 addition & 0 deletions .evergreen/.prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"@mongodb-js/prettier-config-devtools"
4 changes: 3 additions & 1 deletion .evergreen/build-variants/compile-build-variants.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
export type CompileBuildVariantDefinition = {
export type CompileBuildVariant = {
name: string;
displayName: string;
runOn: string;
executableOsId: string;
id?: string;
sharedOpenSsl?: string;
};

export const COMPILE_BUILD_VARIANTS: CompileBuildVariant[];
114 changes: 57 additions & 57 deletions .evergreen/build-variants/compile-build-variants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
// @ts-check

/** @type {(import("./compile-build-variants").CompileBuildVariantDefinition)[]} */
/** @type {import("./compile-build-variants").CompileBuildVariant[]} */
exports.COMPILE_BUILD_VARIANTS = [
{
displayName: "RHEL 7.0 x64",
runOn: "rhel70-build",
executableOsId: "linux-x64",
displayName: 'RHEL 7.0 x64',
runOn: 'rhel70-build',
executableOsId: 'linux-x64',
},
{
displayName: "RHEL 8.0 x64",
runOn: "rhel80-build",
id: "linux_x64_rhel8",
executableOsId: "linux-x64",
displayName: 'RHEL 8.0 x64',
runOn: 'rhel80-build',
id: 'linux_x64_rhel8',
executableOsId: 'linux-x64',
},
{
displayName: "RHEL 7.0 x64",
runOn: "rhel70-build",
executableOsId: "linux-x64-openssl11",
sharedOpenSsl: "openssl11",
displayName: 'RHEL 7.0 x64',
runOn: 'rhel70-build',
executableOsId: 'linux-x64-openssl11',
sharedOpenSsl: 'openssl11',
},
{
displayName: "RHEL 8.0 x64",
runOn: "rhel80-build",
id: "linux_x64_openssl11_rhel8",
executableOsId: "linux-x64-openssl11",
sharedOpenSsl: "openssl11",
displayName: 'RHEL 8.0 x64',
runOn: 'rhel80-build',
id: 'linux_x64_openssl11_rhel8',
executableOsId: 'linux-x64-openssl11',
sharedOpenSsl: 'openssl11',
},
{
displayName: "RHEL 7.0 x64",
runOn: "rhel70-build",
executableOsId: "linux-x64-openssl3",
sharedOpenSsl: "openssl3",
displayName: 'RHEL 7.0 x64',
runOn: 'rhel70-build',
executableOsId: 'linux-x64-openssl3',
sharedOpenSsl: 'openssl3',
},
{
displayName: "RHEL 8.0 x64",
runOn: "rhel80-build",
id: "linux_x64_openssl3_rhel8",
executableOsId: "linux-x64-openssl3",
sharedOpenSsl: "openssl3",
displayName: 'RHEL 8.0 x64',
runOn: 'rhel80-build',
id: 'linux_x64_openssl3_rhel8',
executableOsId: 'linux-x64-openssl3',
sharedOpenSsl: 'openssl3',
},
{
displayName: "Amazon 2 arm64",
runOn: "amazon2-arm64-large",
executableOsId: "linux-arm64",
displayName: 'Amazon 2 arm64',
runOn: 'amazon2-arm64-large',
executableOsId: 'linux-arm64',
},
{
displayName: "Amazon 2 arm64",
runOn: "amazon2-arm64-large",
executableOsId: "linux-arm64-openssl11",
sharedOpenSsl: "openssl11",
displayName: 'Amazon 2 arm64',
runOn: 'amazon2-arm64-large',
executableOsId: 'linux-arm64-openssl11',
sharedOpenSsl: 'openssl11',
},
{
displayName: "Amazon 2 arm64",
runOn: "amazon2-arm64-large",
executableOsId: "linux-arm64-openssl3",
sharedOpenSsl: "openssl3",
displayName: 'Amazon 2 arm64',
runOn: 'amazon2-arm64-large',
executableOsId: 'linux-arm64-openssl3',
sharedOpenSsl: 'openssl3',
},
{
displayName: "RHEL 8 PPC",
runOn: "rhel8-power-small",
executableOsId: "linux-ppc64le",
displayName: 'RHEL 8 PPC',
runOn: 'rhel8-power-small',
executableOsId: 'linux-ppc64le',
},
{
displayName: "RHEL 7 s390x",
runOn: "rhel7-zseries-large",
executableOsId: "linux-s390x",
displayName: 'RHEL 7 s390x',
runOn: 'rhel7-zseries-large',
executableOsId: 'linux-s390x',
},
{
displayName: "MacOS Big Sur",
id: "darwin",
runOn: "macos-11",
executableOsId: "darwin-x64",
displayName: 'MacOS Big Sur',
id: 'darwin',
runOn: 'macos-11',
executableOsId: 'darwin-x64',
},
{
displayName: "MacOS Big Sur arm64",
runOn: "macos-11-arm64",
executableOsId: "darwin-arm64",
displayName: 'MacOS Big Sur arm64',
runOn: 'macos-11-arm64',
executableOsId: 'darwin-arm64',
},
{
id: "win32",
displayName: "Windows VS 2022",
runOn: "windows-vsCurrent-large",
executableOsId: "win32",
id: 'win32',
displayName: 'Windows VS 2022',
runOn: 'windows-vsCurrent-large',
executableOsId: 'win32',
},
].map((buildVariant) => {
const { displayName, sharedOpenSsl, id, executableOsId } = buildVariant;
const formattedDisplayName = [displayName, sharedOpenSsl, "(Build)"]
const formattedDisplayName = [displayName, sharedOpenSsl, '(Build)']
.filter((text) => text)
.join(" ");
.join(' ');

return {
...buildVariant,
id,
displayName: formattedDisplayName,
name: `build_${id ?? executableOsId.replaceAll("-", "_")}`,
name: `build_${id ?? executableOsId.replaceAll('-', '_')}`,
};
});
4 changes: 3 additions & 1 deletion .evergreen/build-variants/e2e-tests-build-variants.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type E2ETestsBuildVariantDefinition = {
export type E2ETestsBuildVariant = {
displayName: string;
name: string;
compileBuildVariant: string;
Expand All @@ -10,3 +10,5 @@ export type E2ETestsBuildVariantDefinition = {
fips?: boolean;
additionalTasks?: string[];
};

export const E2E_TESTS_BUILD_VARIANTS: E2ETestsBuildVariant[];
Loading
Loading