@@ -54,97 +54,7 @@ for (const packageInfo of MONGOSH_PACKAGES) {
54
54
55
55
const ALL_UNIT_TEST_BUILD_VARIANTS = ['darwin_unit', 'linux_unit', 'win32_unit'];
56
56
57
- const EXECUTABLE_PKG_INFO = [
58
- {
59
- executableOsId: 'darwin-x64',
60
- compileBuildVariant: 'darwin',
61
- distributionBuildVariants: [
62
- { name: 'darwin-x64', packageOn: 'darwin', smokeTestKind: 'macos' }
63
- ]
64
- },
65
- {
66
- executableOsId: 'darwin-arm64',
67
- compileBuildVariant: 'darwin_arm64',
68
- distributionBuildVariants: [
69
- { name: 'darwin-arm64', packageOn: 'darwin', smokeTestKind: 'macos' }
70
- ]
71
- },
72
- {
73
- executableOsId: 'linux-x64',
74
- compileBuildVariant: 'linux_x64_build',
75
- distributionBuildVariants: [
76
- { name: 'linux-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'] },
77
- { name: 'debian-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb'] },
78
- { name: 'rhel7-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm'] },
79
- { name: 'rhel8-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm'] },
80
- { name: 'suse-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['suse12-rpm', 'suse15-rpm'] },
81
- { name: 'amzn1-x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['amazonlinux1-rpm'] }
82
- ]
83
- },
84
- {
85
- executableOsId: 'linux-x64-openssl11',
86
- compileBuildVariant: 'linux_x64_build_openssl11',
87
- distributionBuildVariants: [
88
- { name: 'linux-x64-openssl11', packageOn: 'linux_package', smokeTestKind: 'none' },
89
- { name: 'debian-x64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'] },
90
- { name: 'rhel7-x64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm'] },
91
- { name: 'rhel8-x64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm'] }
92
- ]
93
- },
94
- {
95
- executableOsId: 'linux-x64-openssl3',
96
- compileBuildVariant: 'linux_x64_build_openssl3',
97
- distributionBuildVariants: [
98
- { name: 'linux-x64-openssl3', packageOn: 'linux_package', smokeTestKind: 'none' },
99
- { name: 'debian-x64-openssl3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb'] },
100
- { name: 'rhel8-x64-openssl3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm'] }
101
- ]
102
- },
103
- {
104
- executableOsId: 'linux-arm64',
105
- compileBuildVariant: 'linux_arm64_build',
106
- distributionBuildVariants: [
107
- { name: 'linux-arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'] },
108
- { name: 'debian-arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb'] },
109
- { name: 'rhel8-arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm'] },
110
- { name: 'amzn2-arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['amazonlinux2-rpm'] }
111
- ]
112
- },
113
- {
114
- executableOsId: 'linux-arm64-openssl11',
115
- compileBuildVariant: 'linux_arm64_build_openssl11',
116
- distributionBuildVariants: [
117
- { name: 'linux-arm64-openssl11', packageOn: 'linux_package', smokeTestKind: 'none' },
118
- { name: 'debian-arm64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'] },
119
- { name: 'rhel8-arm64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm'] },
120
- { name: 'amzn2-arm64-openssl11', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['amazonlinux2-rpm'] }
121
- ]
122
- },
123
- {
124
- executableOsId: 'linux-ppc64le',
125
- compileBuildVariant: 'linux_ppc64le_build',
126
- distributionBuildVariants: [
127
- { name: 'linux-ppc64le', packageOn: 'linux_package', smokeTestKind: 'none' },
128
- { name: 'rhel8-ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract' }
129
- ]
130
- },
131
- {
132
- executableOsId: 'linux-s390x',
133
- compileBuildVariant: 'linux_s390x_build',
134
- distributionBuildVariants: [
135
- { name: 'linux-s390x', packageOn: 'linux_package', smokeTestKind: 'none' },
136
- { name: 'rhel7-s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract' }
137
- ]
138
- },
139
- {
140
- executableOsId: 'win32',
141
- compileBuildVariant: 'win32_build',
142
- distributionBuildVariants: [
143
- { name: 'win32-x64', packageOn: 'win32', smokeTestKind: 'ssh' },
144
- { name: 'win32msi-x64', packageOn: 'win32', smokeTestKind: 'ssh' }
145
- ]
146
- }
147
- ];
57
+ const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix');
148
58
149
59
%>
150
60
exec_timeout_secs: 3600
@@ -443,11 +353,11 @@ functions:
443
353
#
444
354
# package_and_upload_artifact expects the following arguments:
445
355
# - distro_id
446
- # - distribution_build_variant
356
+ # - package_variant
447
357
# - executable_os_id
448
358
#
449
359
# get_artifact_url expects the following arguments:
450
- # - distribution_build_variant
360
+ # - package_variant
451
361
###
452
362
package_and_upload_artifact:
453
363
- command: expansions.write
@@ -469,15 +379,15 @@ functions:
469
379
env:
470
380
NODE_JS_VERSION: ${node_js_version}
471
381
DISTRO_ID_OVERRIDE: ${distro_id}
472
- DISTRIBUTION_BUILD_VARIANT : ${distribution_build_variant }
382
+ PACKAGE_VARIANT : ${package_variant }
473
383
MACOS_NOTARY_KEY: ${macos_notary_key}
474
384
MACOS_NOTARY_SECRET: ${macos_notary_secret}
475
385
- command: s3.put
476
386
params:
477
387
aws_key: ${aws_key}
478
388
aws_secret: ${aws_secret}
479
389
local_file: src/artifact-url.txt
480
- remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${distribution_build_variant }.txt
390
+ remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${package_variant }.txt
481
391
bucket: mciuploads
482
392
permissions: public-read
483
393
content_type: application/x-gzip
@@ -487,7 +397,7 @@ functions:
487
397
aws_key: ${aws_key}
488
398
aws_secret: ${aws_secret}
489
399
local_file: artifact-url.txt
490
- remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${source_distribution_build_variant }.txt
400
+ remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${source_package_variant }.txt
491
401
bucket: mciuploads
492
402
493
403
write_preload_script:
@@ -796,7 +706,7 @@ tasks:
796
706
###
797
707
# E2E TESTS
798
708
###
799
- <% for (const { executableOsId, compileBuildVariant } of EXECUTABLE_PKG_INFO ) {
709
+ <% for (const { executableOsId, compileBuildVariant } of RELEASE_PACKAGE_MATRIX ) {
800
710
for (const mVersion of ['stable', 'unstable']) {
801
711
for (const fipsVariant of ['fips', 'nofips']) {
802
712
%>
@@ -824,9 +734,9 @@ tasks:
824
734
###
825
735
# PACKAGING
826
736
###
827
- <% for (const { executableOsId, compileBuildVariant, distributionBuildVariants } of EXECUTABLE_PKG_INFO ) {
828
- for (const { name: distributionBuildVariant } of distributionBuildVariants ) { %>
829
- - name: package_and_upload_artifact_<% out(distributionBuildVariant .replace(/-/g, '_')) %>
737
+ <% for (const { executableOsId, compileBuildVariant, packages } of RELEASE_PACKAGE_MATRIX ) {
738
+ for (const { name: packageVariant } of packages ) { %>
739
+ - name: package_and_upload_artifact_<% out(packageVariant .replace(/-/g, '_')) %>
830
740
depends_on:
831
741
- name: compile_artifact
832
742
variant: <% out(compileBuildVariant) %>
@@ -839,15 +749,15 @@ tasks:
839
749
- func: package_and_upload_artifact
840
750
vars:
841
751
node_js_version: "<% out(NODE_JS_VERSION_16) %>"
842
- distribution_build_variant : <% out(distributionBuildVariant ) %>
752
+ package_variant : <% out(packageVariant ) %>
843
753
executable_os_id: <% out(executableOsId) %>
844
754
<% } } %>
845
755
846
756
###
847
757
# SMOKE TESTS
848
758
###
849
- <% for (const { distributionBuildVariants } of EXECUTABLE_PKG_INFO ) {
850
- for (const { name, packageOn, smokeTestKind, smokeTestDockerfiles } of distributionBuildVariants ) if (smokeTestKind !== 'none') {
759
+ <% for (const { packages } of RELEASE_PACKAGE_MATRIX ) {
760
+ for (const { name, packageOn, smokeTestKind, smokeTestDockerfiles } of packages ) if (smokeTestKind !== 'none') {
851
761
for (const dockerfile of smokeTestDockerfiles || ['']) { %>
852
762
- name: pkg_test_<% out(`${smokeTestKind}_${name}${dockerfile ? `_${dockerfile}` : ''}`.replace(/[-.]/g, '_')) %>
853
763
tags: ["smoke-test"]
@@ -858,7 +768,7 @@ tasks:
858
768
- func: checkout
859
769
- func: get_artifact_url
860
770
vars:
861
- source_distribution_build_variant : <% out(name) %>
771
+ source_package_variant : <% out(name) %>
862
772
- func: write_preload_script
863
773
<% switch (smokeTestKind) {
864
774
case 'ssh': { %>
@@ -1007,10 +917,10 @@ buildvariants:
1007
917
display_name: "Ubuntu 18.04 x64 (Packaging)"
1008
918
run_on: ubuntu1804-small
1009
919
tasks:
1010
- <% for (const { executableOsId, distributionBuildVariants } of EXECUTABLE_PKG_INFO ) {
1011
- for (const { name: distributionBuildVariant } of distributionBuildVariants ) {
920
+ <% for (const { executableOsId, packages } of RELEASE_PACKAGE_MATRIX ) {
921
+ for (const { name: packageVariant } of packages ) {
1012
922
if (executableOsId.startsWith('linux')) { %>
1013
- - name: package_and_upload_artifact_<% out(distributionBuildVariant .replace(/-/g, '_')) %>
923
+ - name: package_and_upload_artifact_<% out(packageVariant .replace(/-/g, '_')) %>
1014
924
<% } } } %>
1015
925
- name: linux_x64_build
1016
926
display_name: "RHEL 7.0 x64 (build)"
@@ -1203,19 +1113,19 @@ buildvariants:
1203
1113
display_name: "package smoke tests (x64 Docker)"
1204
1114
run_on: ubuntu1804-small
1205
1115
tasks:
1206
- <% for (const { distributionBuildVariants , executableOsId } of EXECUTABLE_PKG_INFO ) {
1116
+ <% for (const { packages , executableOsId } of RELEASE_PACKAGE_MATRIX ) {
1207
1117
if (executableOsId.includes('linux-x64')) {
1208
- for (const { name, smokeTestKind, smokeTestDockerfiles } of distributionBuildVariants ) if (smokeTestKind !== 'none') {
1118
+ for (const { name, smokeTestKind, smokeTestDockerfiles } of packages ) if (smokeTestKind !== 'none') {
1209
1119
for (const dockerfile of smokeTestDockerfiles || []) { %>
1210
1120
- name: pkg_test_<% out(`${smokeTestKind}_${name}${dockerfile ? `_${dockerfile}` : ''}`.replace(/[-.]/g, '_')) %>
1211
1121
<% } } } } %>
1212
1122
- name: pkg_smoke_tests_docker_arm64
1213
1123
display_name: "package smoke tests (arm64 Docker)"
1214
1124
run_on: ubuntu1804-arm64-small
1215
1125
tasks:
1216
- <% for (const { distributionBuildVariants , executableOsId } of EXECUTABLE_PKG_INFO ) {
1126
+ <% for (const { packages , executableOsId } of RELEASE_PACKAGE_MATRIX ) {
1217
1127
if (executableOsId.includes('linux-arm64')) {
1218
- for (const { name, smokeTestKind, smokeTestDockerfiles } of distributionBuildVariants ) if (smokeTestKind !== 'none') {
1128
+ for (const { name, smokeTestKind, smokeTestDockerfiles } of packages ) if (smokeTestKind !== 'none') {
1219
1129
for (const dockerfile of smokeTestDockerfiles || []) { %>
1220
1130
- name: pkg_test_<% out(`${smokeTestKind}_${name}${dockerfile ? `_${dockerfile}` : ''}`.replace(/[-.]/g, '_')) %>
1221
1131
<% } } } } %>
@@ -1244,17 +1154,17 @@ buildvariants:
1244
1154
display_name: "package smoke tests (RHEL 7.2 s390x)"
1245
1155
run_on: rhel72-zseries-small
1246
1156
tasks:
1247
- - name: pkg_test_rpmextract_rhel7_s390x
1157
+ - name: pkg_test_rpmextract_rpm_s390x
1248
1158
- name: pkg_smoke_tests_rhel83_s390x
1249
1159
display_name: "package smoke tests (RHEL 8.3 s390x)"
1250
1160
run_on: rhel83-zseries-small
1251
1161
tasks:
1252
- - name: pkg_test_rpmextract_rhel7_s390x
1162
+ - name: pkg_test_rpmextract_rpm_s390x
1253
1163
- name: pkg_smoke_tests_rhel81_ppc64le
1254
1164
display_name: "package smoke tests (RHEL 8.1 ppc64le)"
1255
1165
run_on: rhel81-power8-small
1256
1166
tasks:
1257
- - name: pkg_test_rpmextract_rhel8_ppc64le
1167
+ - name: pkg_test_rpmextract_rpm_ppc64le
1258
1168
1259
1169
- name: draft_publish_release
1260
1170
display_name: "Draft/Publish Release"
0 commit comments