Skip to content

Commit 29ec081

Browse files
acmorrowEvergreen Agent
authored andcommitted
SERVER-48282 Add RHEL8.2 arm64 builders
1 parent b87b25e commit 29ec081

File tree

4 files changed

+119
-2
lines changed

4 files changed

+119
-2
lines changed

buildscripts/packager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def build_os(self, arch):
332332
if re.search("(suse)", self.dname):
333333
return ["suse11", "suse12", "suse15"]
334334
elif re.search("(redhat|fedora|centos)", self.dname):
335-
return ["rhel80", "rhel70", "rhel71", "rhel72", "rhel62", "rhel55", "rhel67"]
335+
return ["rhel82", "rhel80", "rhel70", "rhel71", "rhel72", "rhel62", "rhel55", "rhel67"]
336336
elif self.dname in ['amazon', 'amazon2']:
337337
return [self.dname]
338338
elif self.dname == 'ubuntu':

buildscripts/packager_enterprise.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ def build_os(self, arch): # pylint: disable=too-many-branches
137137
if arch == "arm64":
138138
if self.dname == 'ubuntu':
139139
return ["ubuntu1604", "ubuntu1804", "ubuntu2004"]
140+
if self.dname == 'redhat':
141+
return ["rhel82"]
140142
return []
141143

142144
if re.search("(redhat|fedora|centos)", self.dname):

etc/evergreen.yml

Lines changed: 100 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ variables:
360360
- enterprise-rhel-72-s390x
361361
- enterprise-rhel-72-s390x-inmem
362362
- enterprise-rhel-80-64-bit
363+
- enterprise-rhel-82-arm64
363364
- enterprise-suse12-64
364365
- enterprise-suse15-64
365366
- enterprise-suse12-s390x
@@ -392,6 +393,7 @@ variables:
392393
- enterprise-rhel-62-64-bit
393394
- enterprise-rhel-62-64-bit-dynamic-required
394395
- enterprise-rhel-70-64-bit
396+
- enterprise-rhel-82-arm64
395397
- enterprise-ubuntu1604-64
396398
- enterprise-ubuntu1804-64
397399
- enterprise-windows
@@ -421,7 +423,9 @@ variables:
421423
- enterprise-rhel-81-ppc64le
422424
- enterprise-rhel-72-s390x
423425
- rhel80
426+
- rhel-82-arm64
424427
- enterprise-rhel-80-64-bit
428+
- enterprise-rhel-82-arm64
425429
- suse12
426430
- suse12-s390x
427431
- enterprise-suse12-64
@@ -4392,7 +4396,7 @@ tasks:
43924396
## Standalone generational fuzzer for multiversion aggregation expressions ##
43934397
- <<: *jstestfuzz_template
43944398
name: aggregation_expression_multiversion_fuzzer_gen
4395-
tags: ["aggfuzzer"]
4399+
tags: ["aggfuzzer", "multiversion"]
43964400
commands:
43974401
- func: "generate fuzzer tasks"
43984402
vars:
@@ -10757,6 +10761,56 @@ buildvariants:
1075710761
distros:
1075810762
- rhel80-small
1075910763

10764+
- name: enterprise-rhel-82-arm64
10765+
display_name: "Enterprise RHEL 8.2 arm64"
10766+
modules:
10767+
- enterprise
10768+
run_on:
10769+
- rhel82-arm64-small
10770+
expansions:
10771+
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
10772+
push_path: linux
10773+
push_bucket: downloads.10gen.com
10774+
push_name: linux
10775+
push_arch: aarch64-enterprise-rhel82
10776+
compile_flags: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=armv8-a+crc -mtune=generic" --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
10777+
has_packages: true
10778+
packager_script: packager_enterprise.py
10779+
packager_arch: arm64
10780+
packager_distro: rhel82
10781+
repo_edition: enterprise
10782+
scons_cache_scope: shared
10783+
tasks:
10784+
- name: compile_all_run_unittests_TG
10785+
distros:
10786+
- rhel82-arm64-large
10787+
- name: .aggfuzzer !.multiversion
10788+
- name: audit
10789+
- name: auth_audit_gen
10790+
- name: auth_gen
10791+
- name: causally_consistent_jscore_txns_passthrough
10792+
- name: .encrypt !.sharding !.replica_sets !.aggregation !.jscore
10793+
- name: external_auth
10794+
- name: external_auth_aws
10795+
- name: .jscore .common !.compat !.decimal !.sharding
10796+
- name: jsCore_txns_large_txns_format
10797+
- name: .jstestfuzz .common
10798+
- name: .logical_session_cache .one_sec
10799+
- name: replica_sets_auth_gen
10800+
- name: replica_sets_jscore_passthrough
10801+
- name: .replica_sets .multi_oplog
10802+
- name: sasl
10803+
- name: search
10804+
- name: search_auth
10805+
- name: search_ssl
10806+
- name: sharding_auth_audit_gen
10807+
- name: sharding_auth_gen
10808+
- name: snmp
10809+
- name: .stitch
10810+
- name: .publish
10811+
distros:
10812+
- rhel82-arm64-small
10813+
1076010814
# This variant is to intentionally test uncommon features nightly
1076110815
- <<: *enterprise-rhel-70-64-bit-template
1076210816
name: enterprise-rhel-70-64-bit-kitchen-sink
@@ -11027,6 +11081,51 @@ buildvariants:
1102711081
distros:
1102811082
- rhel80-small
1102911083

11084+
- name: rhel-82-arm64
11085+
display_name: RHEL 8.2 arm64
11086+
run_on:
11087+
- rhel82-arm64-small
11088+
expansions:
11089+
push_path: linux
11090+
push_bucket: downloads.mongodb.org
11091+
push_name: linux
11092+
push_arch: aarch64-rhel82
11093+
compile_flags: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) CCFLAGS="-march=armv8-a+crc -mtune=generic" --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
11094+
has_packages: true
11095+
packager_script: packager.py
11096+
packager_arch: arm64
11097+
packager_distro: rhel82
11098+
repo_edition: org
11099+
scons_cache_scope: shared
11100+
tasks:
11101+
- name: compile_all_run_unittests_TG
11102+
distros:
11103+
- rhel82-arm64-large
11104+
- name: aggregation
11105+
- name: .auth !.audit !.multiversion
11106+
- name: causally_consistent_jscore_txns_passthrough
11107+
- name: .misc_js
11108+
- name: .concurrency .common
11109+
distros:
11110+
- rhel82-arm64-large
11111+
- name: concurrency_replication_causal_consistency
11112+
distros:
11113+
- rhel82-arm64-large
11114+
- name: disk_wiredtiger
11115+
- name: free_monitoring
11116+
- name: .jscore .common
11117+
- name: .jstestfuzz .common
11118+
- name: .logical_session_cache .one_sec
11119+
- name: replica_sets
11120+
- name: .replica_sets .common
11121+
- name: .sharding .txns
11122+
- name: .sharding .common !.op_query !.csrs !.multiversion
11123+
- name: .ssl
11124+
- name: .stitch
11125+
- name: .publish
11126+
distros:
11127+
- rhel82-arm64-small
11128+
1103011129
# This variant compiles on RHEL 7.0 and runs tests on RHEL 7.6
1103111130
- name: rhel76_compile_rhel70
1103211131
display_name: RHEL 7.0/7.6 Cross-ABI

etc/repo_config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ repos:
106106
- yum/redhat/8/mongodb-org
107107
- yum/redhat/8Server/mongodb-org
108108

109+
- name: rhel82
110+
type: rpm
111+
edition: org
112+
bucket: repo.mongodb.org
113+
repos:
114+
- yum/redhat/8/mongodb-org
115+
- yum/redhat/8Server/mongodb-org
116+
109117
- name: amazon
110118
type: rpm
111119
edition: org
@@ -313,6 +321,14 @@ repos:
313321
- yum/redhat/8/mongodb-enterprise
314322
- yum/redhat/8Server/mongodb-enterprise
315323

324+
- name: rhel82
325+
type: rpm
326+
edition: enterprise
327+
bucket: repo.mongodb.com
328+
repos:
329+
- yum/redhat/8/mongodb-enterprise
330+
- yum/redhat/8Server/mongodb-enterprise
331+
316332
- name: amazon
317333
type: rpm
318334
edition: enterprise

0 commit comments

Comments
 (0)