Skip to content

Commit 68fd0b9

Browse files
rcsanchez97rcsanchez97
committed
CDRIVER-3908 fix failing rpm-package-build task
1 parent abf9905 commit 68fd0b9

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎.evergreen/build_snapshot_rpm.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ done
4040

4141
package=mongo-c-driver
4242
spec_file=../mongo-c-driver.spec
43-
spec_url=https://src.fedoraproject.org/rpms/mongo-c-driver/raw/master/f/mongo-c-driver.spec
43+
spec_url=https://src.fedoraproject.org/rpms/mongo-c-driver/raw/rawhide/f/mongo-c-driver.spec
4444
config=${MOCK_TARGET_CONFIG:=fedora-34-x86_64}
4545

4646
if [ ! -x /usr/bin/rpmbuild -o ! -x /usr/bin/rpmspec ]; then
@@ -67,7 +67,7 @@ if [ -f "${spec_file}" ]; then
6767
echo "Found old spec file (${spec_file})...removing"
6868
rm -f ${spec_file}
6969
fi
70-
/usr/bin/curl -L --retry 5 -o "${spec_file}" "${spec_url}"
70+
/usr/bin/curl -f -L --retry 5 -o "${spec_file}" "${spec_url}"
7171
if [ "${?}" != "0" -o ! -f "${spec_file}" ]; then
7272
echo "Could not retrieve spec file from URL: ${spec_url}"
7373
exit 1
@@ -84,18 +84,18 @@ fi
8484

8585
build_dir=$(basename $(pwd))
8686

87-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --clean
88-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --init
89-
mock_root=$(sudo mock -r ${config} --bootstrap-chroot --isolation=simple --print-root-path)
90-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --install rpmdevtools git rpm-build cmake python python3-sphinx gcc openssl-devel
91-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
87+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
88+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --init
89+
mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --print-root-path)
90+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python python3-sphinx gcc openssl-devel
91+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
9292
if [ ! -f VERSION_CURRENT ]; then
93-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
93+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
9494
set -o xtrace ;
9595
python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
9696
python build/calc_release_version.py -p > VERSION_RELEASED
9797
)"
98-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
98+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
9999
fi
100100

101101
bare_upstream_version=$(sed -E 's/([^-]+).*/\1/' VERSION_CURRENT)
@@ -110,12 +110,12 @@ current_package_version=$(rpmspec --srpm -q --qf "%{version}-%{release}" ${spec_
110110

111111
if [ -n "${current_package_version##*${git_rev}*}" ]; then
112112
echo "Making RPM changelog entry"
113-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- rpmdev-bumpspec --comment="Built from Git Snapshot." --userstring="Test User <[email protected]>" --new="${snapshot_version}%{?dist}" ${spec_file}
113+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- rpmdev-bumpspec --comment="Built from Git Snapshot." --userstring="Test User <[email protected]>" --new="${snapshot_version}%{?dist}" ${spec_file}
114114
fi
115115

116-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --copyout "/tmp/${build_dir}/${spec_file}" ..
116+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/${spec_file}" ..
117117

118-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
118+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
119119
set -o xtrace ;
120120
[ -d cmake-build ] || mkdir cmake-build ;
121121
cd cmake-build ;
@@ -124,7 +124,7 @@ sudo mock -r ${config} --bootstrap-chroot --isolation=simple --cwd "/tmp/${build
124124
)"
125125

126126
[ -d cmake-build ] || mkdir cmake-build
127-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --copyout "/tmp/${build_dir}/cmake-build/${package}*.tar.gz" cmake-build
127+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/cmake-build/${package}*.tar.gz" cmake-build
128128

129129
[ -d ~/rpmbuild/SOURCES ] || mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
130130
mv cmake-build/${package}*.tar.gz ~/rpmbuild/SOURCES/
@@ -133,21 +133,21 @@ echo "Building source RPM ..."
133133
rpmbuild -bs ${spec_file}
134134
echo "Building binary RPMs ..."
135135
mock_result=$(readlink -f ../mock-result)
136-
sudo mock --resultdir="${mock_result}" --bootstrap-chroot --isolation=simple -r ${config} --no-clean --no-cleanup-after --rebuild ~/rpmbuild/SRPMS/${package}-${snapshot_version}*.src.rpm
137-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --copyin "${mock_result}" /tmp
136+
sudo mock --resultdir="${mock_result}" --use-bootstrap-image --isolation=simple -r ${config} --no-clean --no-cleanup-after --rebuild ~/rpmbuild/SRPMS/${package}-${snapshot_version}*.src.rpm
137+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "${mock_result}" /tmp
138138

139-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
139+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
140140
set -o xtrace &&
141141
rpm -Uvh ../mock-result/*.rpm &&
142142
gcc -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -o example-client src/libmongoc/examples/example-client.c -lmongoc-1.0 -lbson-1.0
143143
)"
144144

145145
if [ ! -e "${mock_root}/tmp/${build_dir}/example-client" ]; then
146146
echo "Example was not built!"
147-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --clean
147+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
148148
exit 1
149149
fi
150150

151-
sudo mock -r ${config} --bootstrap-chroot --isolation=simple --clean
151+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
152152
(cd "${mock_result}" ; tar zcvf ../rpm.tar.gz *.rpm)
153153

‎.evergreen/spec.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%global gh_project mongo-c-driver
55
%global libname libmongoc
66
%global libver 1.0
7-
-%global up_version 1.17.2
7+
-%global up_version 1.17.4
88
+%global up_version 1.18.0
99
#global up_prever rc0
1010
# disabled as require a MongoDB server
@@ -17,23 +17,23 @@
1717
Release: 1%{?dist}
1818
# See THIRD_PARTY_NOTICES
1919
License: ASL 2.0 and ISC and MIT and zlib
20-
@@ -38,7 +38,6 @@
20+
@@ -39,7 +39,6 @@
2121
BuildRequires: mongodb-server
2222
BuildRequires: openssl
2323
%endif
2424
-BuildRequires: cmake(mongocrypt)
2525
BuildRequires: perl-interpreter
2626
# From man pages
2727
BuildRequires: python3
28-
@@ -68,7 +67,6 @@
28+
@@ -69,7 +68,6 @@
2929
Requires: pkgconfig
3030
Requires: cmake-filesystem
3131
Requires: pkgconfig(libzstd)
3232
-Requires: cmake(mongocrypt)
3333

3434
%description devel
3535
This package contains the header files and development libraries
36-
@@ -127,7 +125,6 @@
36+
@@ -128,7 +126,6 @@
3737
%endif
3838
-DENABLE_EXAMPLES:BOOL=OFF \
3939
-DENABLE_UNINSTALL:BOOL=OFF \

0 commit comments

Comments
 (0)