Skip to content

Commit 4b7aaa9

Browse files
Fix and update EVG configuration for releases/v4.1 (#1435)
* Update Clang 18 -> Clang 19 for rhel95 distro (#1421) * CXX-3287 assume role before `pull-mongohouse-image.sh` (#1413) --------- Co-authored-by: Kevin Albertson <kevin.albertson@mongodb.com>
1 parent 3cb052e commit 4b7aaa9

File tree

5 files changed

+51
-40
lines changed

5 files changed

+51
-40
lines changed

.evergreen/config_generator/components/abi_stability.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def generate_tasks():
147147
if func is Abidiff:
148148
distro_name = 'ubuntu2204' # Clang 12, libabigail is not available on RHEL distros.
149149
else:
150-
distro_name = 'rhel95' # Clang 18.
150+
distro_name = 'rhel95' # Clang 19.
151151

152152
distro = find_large_distro(distro_name)
153153

.evergreen/config_generator/components/compile_only.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
MATRIX = [
1919
# C++ standard and compiler coverage
2020

21-
('rhel80', 'clang', [11, 17, 20, ]), # Clang 7.0 (max: C++20)
22-
('ubuntu2004', 'clang-10', [11, 17, 20, ]), # Clang 10.0 (max: C++20)
23-
('rhel84', 'clang', [11, 17, 20, ]), # Clang 11.0 (max: C++20)
24-
('ubuntu2204', 'clang-12', [11, 17, 20, 23]), # Clang 12.0 (max: C++23)
25-
('rhel90', 'clang', [11, 17, 20, 23]), # Clang 13.0 (max: C++23)
26-
('rhel91', 'clang', [11, 17, 20, 23]), # Clang 14.0 (max: C++23)
27-
('rhel92', 'clang', [11, 17, 20, 23]), # Clang 15.0 (max: C++23)
28-
('rhel93', 'clang', [11, 17, 20, 23]), # Clang 16.0 (max: C++23)
29-
('rhel94', 'clang', [11, 17, 20, 23]), # Clang 17.0 (max: C++23)
30-
('rhel95', 'clang', [11, 17, 20, 23]), # Clang 18.0 (max: C++23)
21+
('rhel80', 'clang', [11, 17, 20, ]), # Clang 7 (max: C++20)
22+
('ubuntu2004', 'clang-10', [11, 17, 20, ]), # Clang 10 (max: C++20)
23+
('rhel84', 'clang', [11, 17, 20, ]), # Clang 11 (max: C++20)
24+
('ubuntu2204', 'clang-12', [11, 17, 20, 23]), # Clang 12 (max: C++23)
25+
('rhel90', 'clang', [11, 17, 20, 23]), # Clang 13 (max: C++23)
26+
('rhel91', 'clang', [11, 17, 20, 23]), # Clang 14 (max: C++23)
27+
('rhel92', 'clang', [11, 17, 20, 23]), # Clang 15 (max: C++23)
28+
('rhel93', 'clang', [11, 17, 20, 23]), # Clang 16 (max: C++23)
29+
('rhel94', 'clang', [11, 17, 20, 23]), # Clang 17 (max: C++23)
30+
('rhel95', 'clang', [11, 17, 20, 23]), # Clang 19 (max: C++23)
3131

3232
('rhel76', 'gcc', [11, 14, ]), # GCC 4.8 (max: C++14)
3333
('rhel80', 'gcc', [11, 17, 20, ]), # GCC 8.2 (max: C++20)

.evergreen/config_generator/components/mongohouse.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from config_generator.etc.utils import bash_exec
99

1010
from shrub.v3.evg_build_variant import BuildVariant
11-
from shrub.v3.evg_command import EvgCommandType
11+
from shrub.v3.evg_command import EvgCommandType, ec2_assume_role
1212
from shrub.v3.evg_task import EvgTask, EvgTaskRef
1313

1414

@@ -17,18 +17,22 @@
1717

1818
class BuildMongohouse(Function):
1919
name = 'build_mongohouse'
20-
commands = bash_exec(
21-
command_type=EvgCommandType.SETUP,
22-
script='''\
23-
if [ ! -d "drivers-evergreen-tools" ]; then
24-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
25-
fi
26-
cd drivers-evergreen-tools
27-
export DRIVERS_TOOLS=$(pwd)
28-
29-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
30-
'''
31-
)
20+
commands = [
21+
ec2_assume_role (role_arn='${aws_test_secrets_role}'),
22+
bash_exec(
23+
include_expansions_in_env=["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"],
24+
command_type=EvgCommandType.SETUP,
25+
script='''\
26+
if [ ! -d "drivers-evergreen-tools" ]; then
27+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
28+
fi
29+
cd drivers-evergreen-tools
30+
export DRIVERS_TOOLS=$(pwd)
31+
32+
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
33+
'''
34+
)
35+
]
3236

3337

3438
class RunMongohouse(Function):

.evergreen/generated_configs/functions.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,27 @@ functions:
200200
permissions: public-read
201201
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/rpm-packages.tar.gz
202202
build_mongohouse:
203-
command: subprocess.exec
204-
type: setup
205-
params:
206-
binary: bash
207-
args:
208-
- -c
209-
- |
210-
if [ ! -d "drivers-evergreen-tools" ]; then
211-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
212-
fi
213-
cd drivers-evergreen-tools
214-
export DRIVERS_TOOLS=$(pwd)
203+
- command: ec2.assume_role
204+
params:
205+
role_arn: ${aws_test_secrets_role}
206+
- command: subprocess.exec
207+
type: setup
208+
params:
209+
binary: bash
210+
include_expansions_in_env:
211+
- AWS_ACCESS_KEY_ID
212+
- AWS_SECRET_ACCESS_KEY
213+
- AWS_SESSION_TOKEN
214+
args:
215+
- -c
216+
- |
217+
if [ ! -d "drivers-evergreen-tools" ]; then
218+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
219+
fi
220+
cd drivers-evergreen-tools
221+
export DRIVERS_TOOLS=$(pwd)
215222
216-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
223+
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
217224
check augmented sbom:
218225
- command: ec2.assume_role
219226
type: setup

.evergreen/scripts/abi-stability-setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ mkdir -p "${working_dir}/install"
6767
# For latest Clang versions supporting recent C++ standards.
6868
export CC CXX
6969
case "${distro_id:?}" in
70-
rhel9*)
71-
CC="clang-18"
72-
CXX="clang++-18"
70+
rhel95*)
71+
CC="clang-19"
72+
CXX="clang++-19"
7373
;;
7474
ubuntu22*)
7575
CC="clang-12"

0 commit comments

Comments
 (0)