Skip to content

Commit 62aebdf

Browse files
gagikgagik
authored
chore(ci): reorganize evergreen configuration for unit tests (#2306)
1 parent b837066 commit 62aebdf

10 files changed

+510
-411
lines changed

‎.evergreen/.prettierrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@mongodb-js/prettier-config-devtools"

‎.evergreen/build-variants/compile-build-variants.d.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
export type CompileBuildVariantDefinition = {
1+
export type CompileBuildVariant = {
22
name: string;
33
displayName: string;
44
runOn: string;
55
executableOsId: string;
66
id?: string;
77
sharedOpenSsl?: string;
88
};
9+
10+
export const COMPILE_BUILD_VARIANTS: CompileBuildVariant[];

‎.evergreen/build-variants/compile-build-variants.js‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
11
// @ts-check
22

3-
/** @type {(import("./compile-build-variants").CompileBuildVariantDefinition)[]} */
3+
/** @type {import("./compile-build-variants").CompileBuildVariant[]} */
44
exports.COMPILE_BUILD_VARIANTS = [
55
{
6-
displayName: "RHEL 7.0 x64",
7-
runOn: "rhel70-build",
8-
executableOsId: "linux-x64",
6+
displayName: 'RHEL 7.0 x64',
7+
runOn: 'rhel70-build',
8+
executableOsId: 'linux-x64',
99
},
1010
{
11-
displayName: "RHEL 8.0 x64",
12-
runOn: "rhel80-build",
13-
id: "linux_x64_rhel8",
14-
executableOsId: "linux-x64",
11+
displayName: 'RHEL 8.0 x64',
12+
runOn: 'rhel80-build',
13+
id: 'linux_x64_rhel8',
14+
executableOsId: 'linux-x64',
1515
},
1616
{
17-
displayName: "RHEL 7.0 x64",
18-
runOn: "rhel70-build",
19-
executableOsId: "linux-x64-openssl11",
20-
sharedOpenSsl: "openssl11",
17+
displayName: 'RHEL 7.0 x64',
18+
runOn: 'rhel70-build',
19+
executableOsId: 'linux-x64-openssl11',
20+
sharedOpenSsl: 'openssl11',
2121
},
2222
{
23-
displayName: "RHEL 8.0 x64",
24-
runOn: "rhel80-build",
25-
id: "linux_x64_openssl11_rhel8",
26-
executableOsId: "linux-x64-openssl11",
27-
sharedOpenSsl: "openssl11",
23+
displayName: 'RHEL 8.0 x64',
24+
runOn: 'rhel80-build',
25+
id: 'linux_x64_openssl11_rhel8',
26+
executableOsId: 'linux-x64-openssl11',
27+
sharedOpenSsl: 'openssl11',
2828
},
2929
{
30-
displayName: "RHEL 7.0 x64",
31-
runOn: "rhel70-build",
32-
executableOsId: "linux-x64-openssl3",
33-
sharedOpenSsl: "openssl3",
30+
displayName: 'RHEL 7.0 x64',
31+
runOn: 'rhel70-build',
32+
executableOsId: 'linux-x64-openssl3',
33+
sharedOpenSsl: 'openssl3',
3434
},
3535
{
36-
displayName: "RHEL 8.0 x64",
37-
runOn: "rhel80-build",
38-
id: "linux_x64_openssl3_rhel8",
39-
executableOsId: "linux-x64-openssl3",
40-
sharedOpenSsl: "openssl3",
36+
displayName: 'RHEL 8.0 x64',
37+
runOn: 'rhel80-build',
38+
id: 'linux_x64_openssl3_rhel8',
39+
executableOsId: 'linux-x64-openssl3',
40+
sharedOpenSsl: 'openssl3',
4141
},
4242
{
43-
displayName: "Amazon 2 arm64",
44-
runOn: "amazon2-arm64-large",
45-
executableOsId: "linux-arm64",
43+
displayName: 'Amazon 2 arm64',
44+
runOn: 'amazon2-arm64-large',
45+
executableOsId: 'linux-arm64',
4646
},
4747
{
48-
displayName: "Amazon 2 arm64",
49-
runOn: "amazon2-arm64-large",
50-
executableOsId: "linux-arm64-openssl11",
51-
sharedOpenSsl: "openssl11",
48+
displayName: 'Amazon 2 arm64',
49+
runOn: 'amazon2-arm64-large',
50+
executableOsId: 'linux-arm64-openssl11',
51+
sharedOpenSsl: 'openssl11',
5252
},
5353
{
54-
displayName: "Amazon 2 arm64",
55-
runOn: "amazon2-arm64-large",
56-
executableOsId: "linux-arm64-openssl3",
57-
sharedOpenSsl: "openssl3",
54+
displayName: 'Amazon 2 arm64',
55+
runOn: 'amazon2-arm64-large',
56+
executableOsId: 'linux-arm64-openssl3',
57+
sharedOpenSsl: 'openssl3',
5858
},
5959
{
60-
displayName: "RHEL 8 PPC",
61-
runOn: "rhel8-power-small",
62-
executableOsId: "linux-ppc64le",
60+
displayName: 'RHEL 8 PPC',
61+
runOn: 'rhel8-power-small',
62+
executableOsId: 'linux-ppc64le',
6363
},
6464
{
65-
displayName: "RHEL 7 s390x",
66-
runOn: "rhel7-zseries-large",
67-
executableOsId: "linux-s390x",
65+
displayName: 'RHEL 7 s390x',
66+
runOn: 'rhel7-zseries-large',
67+
executableOsId: 'linux-s390x',
6868
},
6969
{
70-
displayName: "MacOS Big Sur",
71-
id: "darwin",
72-
runOn: "macos-11",
73-
executableOsId: "darwin-x64",
70+
displayName: 'MacOS Big Sur',
71+
id: 'darwin',
72+
runOn: 'macos-11',
73+
executableOsId: 'darwin-x64',
7474
},
7575
{
76-
displayName: "MacOS Big Sur arm64",
77-
runOn: "macos-11-arm64",
78-
executableOsId: "darwin-arm64",
76+
displayName: 'MacOS Big Sur arm64',
77+
runOn: 'macos-11-arm64',
78+
executableOsId: 'darwin-arm64',
7979
},
8080
{
81-
id: "win32",
82-
displayName: "Windows VS 2022",
83-
runOn: "windows-vsCurrent-large",
84-
executableOsId: "win32",
81+
id: 'win32',
82+
displayName: 'Windows VS 2022',
83+
runOn: 'windows-vsCurrent-large',
84+
executableOsId: 'win32',
8585
},
8686
].map((buildVariant) => {
8787
const { displayName, sharedOpenSsl, id, executableOsId } = buildVariant;
88-
const formattedDisplayName = [displayName, sharedOpenSsl, "(Build)"]
88+
const formattedDisplayName = [displayName, sharedOpenSsl, '(Build)']
8989
.filter((text) => text)
90-
.join(" ");
90+
.join(' ');
9191

9292
return {
9393
...buildVariant,
9494
id,
9595
displayName: formattedDisplayName,
96-
name: `build_${id ?? executableOsId.replaceAll("-", "_")}`,
96+
name: `build_${id ?? executableOsId.replaceAll('-', '_')}`,
9797
};
9898
});

‎.evergreen/build-variants/e2e-tests-build-variants.d.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export type E2ETestsBuildVariantDefinition = {
1+
export type E2ETestsBuildVariant = {
22
displayName: string;
33
name: string;
44
compileBuildVariant: string;
@@ -10,3 +10,5 @@ export type E2ETestsBuildVariantDefinition = {
1010
fips?: boolean;
1111
additionalTasks?: string[];
1212
};
13+
14+
export const E2E_TESTS_BUILD_VARIANTS: E2ETestsBuildVariant[];

0 commit comments

Comments
 (0)