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

fix retry

Browse source
This commit is contained in:
Alexander Stefanov 2019-08-13 17:11:47 +03:00
parent d437224c29
commit da2b1cc713
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build-rpm.sh
View file

@ -290,17 +290,11 @@ do
fi
fi
$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after --no-clean $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
rc=${PIPESTATUS[0]}
python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
if [[ $? -ne 0 ]]; then exit 6; fi
else
$MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
if [[ $? -ne 0 ]]; then exit 1; fi
# rc=${PIPESTATUS[0]}
# python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
# if [[ $? -ne 0 ]]; then exit 6; fi
fi
rc=${PIPESTATUS[0]}
try_rebuild=false
if [[ $rc != 0 && $retry < $MAX_RETRIES ]]; then
if grep -q "$RETRY_GREP_STR" $OUTPUT_FOLDER/root.log; then
@ -326,6 +320,13 @@ fi
echo '--> src.rpm build has been done successfully.'
python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
rc=$?
if [ $rc != 0 ] ; then
echo '--> Build for this architecture is forbidden!'
exit 6
fi
echo '--> Building rpm'
try_rebuild=true
retry=0