Skip to content

Commit db98dc7

Browse files
authored
CDRIVER-4794 build RPM in EPEL environments (#1581)
1 parent fc3602f commit db98dc7

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

Diff for: .evergreen/generated_configs/legacy-config.yml

+20
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,26 @@ tasks:
914914
permissions: public-read
915915
local_file: rpm.tar.gz
916916
content_type: ${content_type|application/x-gzip}
917+
- command: shell.exec
918+
type: test
919+
params:
920+
working_dir: mongoc
921+
shell: bash
922+
script: |-
923+
set -o errexit
924+
sudo rm -rf ../build ../mock-result ../rpm.tar.gz
925+
export MOCK_TARGET_CONFIG=rocky+epel-9-aarch64
926+
sh -x .evergreen/scripts/build_snapshot_rpm.sh
927+
- command: shell.exec
928+
type: test
929+
params:
930+
working_dir: mongoc
931+
shell: bash
932+
script: |-
933+
set -o errexit
934+
sudo rm -rf ../build ../mock-result ../rpm.tar.gz
935+
export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64
936+
sh -x .evergreen/scripts/build_snapshot_rpm.sh
917937
- name: install-uninstall-check-mingw
918938
commands:
919939
- command: shell.exec

Diff for: .evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

+2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ def __init__(
340340
remote_file="${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-rpm-packages.tar.gz",
341341
content_type="${content_type|application/x-gzip}",
342342
),
343+
shell_mongoc("sudo rm -rf ../build ../mock-result ../rpm.tar.gz\n" "export MOCK_TARGET_CONFIG=rocky+epel-9-aarch64\n" "sh .evergreen/scripts/build_snapshot_rpm.sh"),
344+
shell_mongoc("sudo rm -rf ../build ../mock-result ../rpm.tar.gz\n" "export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64\n" "sh .evergreen/scripts/build_snapshot_rpm.sh"),
343345
],
344346
),
345347
NamedTask(

Diff for: .evergreen/scripts/build_snapshot_rpm.sh

+9-3
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,17 @@ build_dir=$(basename $(pwd))
7676
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
7777
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --init
7878
mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --print-root-path)
79-
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python gcc openssl-devel
79+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python3.11 gcc openssl-devel
80+
81+
# This step is needed to avoid the following error on rocky+epel8:
82+
# Problem: conflicting requests
83+
# - package utf8proc-devel-2.6.1-3.module+el8.7.0+1065+42200b2e.aarch64 from powertools is filtered out by modular filtering
84+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --dnf-cmd --setopt=powertools.module_hotfixes=true install utf8proc-devel
85+
8086
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
8187
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
82-
python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
83-
python build/calc_release_version.py -p > VERSION_RELEASED
88+
python3.11 build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
89+
python3.11 build/calc_release_version.py -p > VERSION_RELEASED
8490
)"
8591
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
8692

0 commit comments

Comments
 (0)