[CI] issue: HPCINFRA-1736 improve RPM/DEB build time

Add parallel compilation flag (-j) to RPM and DEB builds to improve compile time.

Signed-off-by: Noam Tsemah <[email protected]>

Author: ntsemah

contrib/build_pkg.sh

@@ -192,30 +192,30 @@ if [ $opt_tarpkg -eq 1 ]; then
     # Get version for directory name
     tarball_name=$(basename ${pkg_tarball})
     tarball_root_dir=${tarball_name%.tar.gz}
-    
+
     # Create a temporary directory using mktemp instead of a fixed name
     tarball_tmp=$(mktemp -d -p ${pkg_dir}) >> ${pkg_log} 2>&1
     tar -xzf ${pkg_tarball} -C ${tarball_tmp} >> ${pkg_log} 2>&1
     if [ $? -ne 0 ]; then
         echo "ERROR: Failed to extract tarball ${pkg_tarball}. Exit" >> ${pkg_log}
         exit 1
     fi
-    
+
     # Move spec file to the root directory to support rpmbuild
     cp ${pkg_dir}/contrib/scripts/${pkg_spec} ${tarball_tmp}/${tarball_root_dir}/ >> ${pkg_log} 2>&1
     # Remove the duplicate spec file
     rm ${tarball_tmp}/${tarball_root_dir}/contrib/scripts/${pkg_spec} >> ${pkg_log} 2>&1
-    
+
     # Create new tarball with proper structure
     pushd ${tarball_tmp} >> ${pkg_log} 2>&1
     tar -czf ${pkg_outdir}/${tarball_name} ${tarball_root_dir} >> ${pkg_log} 2>&1
     popd >> ${pkg_log} 2>&1
-    
+
     echo ${pkg_label} "Release tarball created: ${pkg_outdir}/${tarball_name}"
-    
+
     # Add tarball temporary directory to cleanup
     pkg_cleanup="${pkg_cleanup} ${tarball_tmp}"
-	
+
 fi
 
 if [ "$rc" -eq 0 ]; then

contrib/jenkins_tests/rpm.sh

@@ -33,7 +33,8 @@ else
                --define='_sourcedir ${rpm_dir}' \
                --define='_specdir ${rpm_dir}' \
                --define='_builddir ${rpm_dir}' \
-               --define='_tmppath ${rpm_dir}/_tmp'"
+               --define='_tmppath ${rpm_dir}/_tmp' \
+               --define='_make_opt ${make_opt}'"
     rpmopts="--buildroot='${rpm_dir}/_rpm'"
 fi
 
@@ -66,7 +67,7 @@ if [ $opt_srcrpm -eq 1 ]; then
     if [ $opt_rpm -eq 1 ]; then
         test_exec="env RPM_BUILD_NCPUS=${NPROC} rpmbuild -bs $rpmmacros $rpmopts $rpmspec"
     else
-        test_exec="dpkg-buildpackage -us -uc -S"
+        test_exec="env make_opt=\"${make_opt}\" dpkg-buildpackage -us -uc -S"
     fi
     do_check_result "$test_exec" "$test_id" "srcrpm" "$rpm_tap" "${rpm_dir}/rpm-${test_id}"
     test_id=$((test_id+1))
@@ -76,7 +77,7 @@ if [ $opt_binrpm -eq 1 ]; then
     if [ $opt_rpm -eq 1 ]; then
         test_exec="env RPM_BUILD_NCPUS=${NPROC} rpmbuild -bb --define='configure_options $jenkins_test_custom_configure' $rpmmacros $rpmopts $rpmspec"
     else
-        test_exec="env configure_options=\"$jenkins_test_custom_configure\" dpkg-buildpackage -us -uc -b"
+        test_exec="env make_opt=\"${make_opt}\" configure_options=\"$jenkins_test_custom_configure\" dpkg-buildpackage -us -uc -b"
     fi
     do_check_result "$test_exec" "$test_id" "binrpm" "$rpm_tap" "${rpm_dir}/rpm-${test_id}"
     test_id=$((test_id+1))

debian/rules

@@ -16,7 +16,7 @@ build-debug:
 	./configure --with-ofed=/usr --prefix=/usr \
 		--libdir=/usr/lib --includedir=/usr/include --sysconfdir=/etc \
 		--enable-opt-log=none --enable-debug ${configure_options}
-	make
+	make ${make_opt}
 	cp -f src/core/.libs/libxlio.so libxlio-debug.so
 	make clean