Djam/r11-builder-agent
1
0
Fork 0
mirror of https://tvoygit.ru/Djam/r11-builder-agent.git synced 2025-02-23 10:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace save_buildroot to prevent cleanup before saving

Browse source
This commit is contained in:
Alexander Stefanov 2019-04-10 17:42:34 +03:00
parent f118fbe06b
commit e14329dea2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build-rpm.sh
View file

@ -368,6 +368,10 @@ echo '--> Create rpm -qa list'
CHROOT_PATH="$($MOCK_BIN --configdir=$config_dir --print-root-path)" CHROOT_PATH="$($MOCK_BIN --configdir=$config_dir --print-root-path)"
rpm --root="$CHROOT_PATH" -qa > "$OUTPUT_FOLDER/rpm-qa.log" rpm --root="$CHROOT_PATH" -qa > "$OUTPUT_FOLDER/rpm-qa.log"
# (tpg) Save build chroot
if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then
sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/$platform_name-$platform_arch/root/
fi
# Check exit code after build # Check exit code after build
if [ $rc != 0 ]; then if [ $rc != 0 ]; then
echo '--> Build failed: mock-urpm encountered a problem.' echo '--> Build failed: mock-urpm encountered a problem.'
@ -384,10 +388,6 @@ echo '--> Done.'
echo "--> Grepping rpmlint logs from $OUTPUT_FOLDER/build.log to $OUTPUT_FOLDER/rpmlint.log" echo "--> Grepping rpmlint logs from $OUTPUT_FOLDER/build.log to $OUTPUT_FOLDER/rpmlint.log"
sed -n "/Executing \"\/usr\/bin\/rpmlint/,/packages and.*specfiles checked/p" $OUTPUT_FOLDER/build.log > $OUTPUT_FOLDER/rpmlint.log sed -n "/Executing \"\/usr\/bin\/rpmlint/,/packages and.*specfiles checked/p" $OUTPUT_FOLDER/build.log > $OUTPUT_FOLDER/rpmlint.log
# (tpg) Save build chroot
if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then
sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/$platform_name-$platform_arch/root/
fi
# Test RPM files # Test RPM files
if [ "$use_extra_tests" = 'true' ]; then if [ "$use_extra_tests" = 'true' ]; then