fix broken rpm-package-build task

Author: rcsanchez97

.evergreen/build_snapshot_rpm.sh

@@ -40,8 +40,8 @@ done
 
 package=mongo-c-driver
 spec_file=../mongo-c-driver.spec
-spec_url=https://src.fedoraproject.org/rpms/mongo-c-driver/raw/master/f/mongo-c-driver.spec
-config=${MOCK_TARGET_CONFIG:=fedora-29-x86_64}
+spec_url=https://src.fedoraproject.org/rpms/mongo-c-driver/raw/rawhide/f/mongo-c-driver.spec
+config=${MOCK_TARGET_CONFIG:=fedora-34-x86_64}
 
 if [ ! -x /usr/bin/rpmbuild -o ! -x /usr/bin/rpmspec ]; then
   echo "Missing the rpmbuild or rpmspec utility from the rpm-build package"
@@ -67,7 +67,7 @@ if [ -f "${spec_file}" ]; then
   echo "Found old spec file (${spec_file})...removing"
   rm -f  ${spec_file}
 fi
-/usr/bin/curl -L --retry 5 -o "${spec_file}" "${spec_url}"
+/usr/bin/curl -f -L --retry 5 -o "${spec_file}" "${spec_url}"
 if [ "${?}" != "0" -o ! -f "${spec_file}" ]; then
   echo "Could not retrieve spec file from URL: ${spec_url}"
   exit 1
@@ -84,19 +84,17 @@ fi
 
 build_dir=$(basename $(pwd))
 
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --clean
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --init
-mock_root=$(sudo mock -r ${config} --bootstrap-chroot --old-chroot --print-root-path)
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --install rpmdevtools git rpm-build cmake python python2-sphinx gcc openssl-devel
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
-if [ ! -f VERSION_CURRENT ]; then
-  sudo mock -r ${config} --bootstrap-chroot --old-chroot --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
-    set -o xtrace ;
-    python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
-    python build/calc_release_version.py -p > VERSION_RELEASED
-    )"
-  sudo mock -r ${config} --bootstrap-chroot --old-chroot --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
-fi
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --init
+mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --print-root-path)
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python python3-sphinx gcc openssl-devel
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
+  set -o xtrace ;
+  python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
+  python build/calc_release_version.py -p > VERSION_RELEASED
+  )"
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
 
 bare_upstream_version=$(sed -E 's/([^-]+).*/\1/' VERSION_CURRENT)
 # Upstream version in the .spec file cannot have hyphen (-); replace the current
@@ -110,12 +108,12 @@ current_package_version=$(rpmspec --srpm -q --qf "%{version}-%{release}" ${spec_
 
 if [ -n "${current_package_version##*${git_rev}*}" ]; then
   echo "Making RPM changelog entry"
-  sudo mock -r ${config} --bootstrap-chroot --old-chroot --cwd "/tmp/${build_dir}" --chroot -- rpmdev-bumpspec --comment="Built from Git Snapshot." --userstring="Test User <[email protected]>" --new="${snapshot_version}%{?dist}" ${spec_file}
+  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}
 fi
 
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --copyout "/tmp/${build_dir}/${spec_file}" ..
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/${spec_file}" ..
 
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
   set -o xtrace ;
   [ -d cmake-build ] || mkdir cmake-build ;
   cd cmake-build ;
@@ -124,7 +122,7 @@ sudo mock -r ${config} --bootstrap-chroot --old-chroot --cwd "/tmp/${build_dir}"
   )"
 
 [ -d cmake-build ] || mkdir cmake-build
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --copyout "/tmp/${build_dir}/cmake-build/${package}*.tar.gz" cmake-build
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/cmake-build/${package}*.tar.gz" cmake-build
 
 [ -d ~/rpmbuild/SOURCES ] || mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 mv cmake-build/${package}*.tar.gz ~/rpmbuild/SOURCES/
@@ -133,21 +131,21 @@ echo "Building source RPM ..."
 rpmbuild -bs ${spec_file}
 echo "Building binary RPMs ..."
 mock_result=$(readlink -f ../mock-result)
-sudo mock --resultdir="${mock_result}" --bootstrap-chroot --old-chroot -r ${config} --no-clean --no-cleanup-after --rebuild ~/rpmbuild/SRPMS/${package}-${snapshot_version}*.src.rpm
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --copyin "${mock_result}" /tmp
+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
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "${mock_result}" /tmp
 
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
   set -o xtrace &&
   rpm -Uvh ../mock-result/*.rpm &&
   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
   )"
 
 if [ ! -e "${mock_root}/tmp/${build_dir}/example-client" ]; then
   echo "Example was not built!"
-  sudo mock -r ${config} --bootstrap-chroot --old-chroot --clean
+  sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
   exit 1
 fi
 
-sudo mock -r ${config} --bootstrap-chroot --old-chroot --clean
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
 (cd "${mock_result}" ; tar zcvf ../rpm.tar.gz *.rpm)
 

.evergreen/spec.patch

@@ -1,26 +1,43 @@
---- mongo-c-driver.spec.orig	2019-08-27 21:43:20.721612865 +0000
-+++ mongo-c-driver.spec	2019-08-27 22:28:57.276867708 +0000
-@@ -38,7 +38,6 @@ BuildRequires: pkgconfig(libzstd)
+--- mongo-c-driver.spec.orig	2020-11-30 10:07:51.831526659 -0500
++++ mongo-c-driver.spec	2020-11-30 10:09:59.029834450 -0500
+@@ -10,14 +10,14 @@
+ %global gh_project   mongo-c-driver
+ %global libname      libmongoc
+ %global libver       1.0
+-%global up_version   1.17.4
++%global up_version   1.17.5
+ #global up_prever    rc0
+ # disabled as require a MongoDB server
+ %bcond_with          tests
+ 
+ Name:      mongo-c-driver
+ Summary:   Client library written in C for MongoDB
+-Version:   %{up_version}%{?up_prever:~%{up_prever}}
++Version:   %{up_version}%{up_prever}
+ Release:   1%{?dist}
+ # See THIRD_PARTY_NOTICES
+ License:   ASL 2.0 and ISC and MIT and zlib
+@@ -39,7 +39,6 @@
  BuildRequires: mongodb-server
  BuildRequires: openssl
  %endif
 -BuildRequires: cmake(mongocrypt)
  BuildRequires: perl-interpreter
  # From man pages
  BuildRequires: python3
-@@ -68,7 +67,6 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
+@@ -69,7 +68,6 @@
  Requires:   pkgconfig
  Requires:   cmake-filesystem
  Requires:   pkgconfig(libzstd)
 -Requires:   cmake(mongocrypt)
 
  %description devel
  This package contains the header files and development libraries
-@@ -126,7 +124,6 @@ Documentation: http://mongoc.org/libbson/%{version}/
+@@ -128,7 +126,6 @@
  %endif
      -DENABLE_EXAMPLES:BOOL=OFF \
      -DENABLE_UNINSTALL:BOOL=OFF \
 -    -DENABLE_CLIENT_SIDE_ENCRYPTION:BOOL=ON \
-     .
+     -S .
 
- make %{?_smp_mflags}
+ %if 0%{?cmake_build:1}