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

Merge branch 'master' of https://github.com/OpenMandrivaSoftware/rosa-builder

Browse source
This commit is contained in:
Alex 2019-12-21 23:07:19 +00:00
commit 044a810771
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build-rpm.sh
View file

@ -289,9 +289,9 @@ do
sleep ${WAIT_TIME} sleep ${WAIT_TIME}
fi fi
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 $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
else 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 $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER
fi fi
rc=${PIPESTATUS[0]} rc=${PIPESTATUS[0]}
@ -336,7 +336,7 @@ do
# need to add tee > log # need to add tee > log
# because of some weird reason --readdrepo does not place root.log in the proper place # because of some weird reason --readdrepo does not place root.log in the proper place
$MOCK_BIN --readdrepo -v --configdir $config_dir --resultdir=$OUTPUT_FOLDER 2>&1 | tee $OUTPUT_FOLDER/build.log.tmp $MOCK_BIN --readdrepo -v --configdir $config_dir --resultdir=$OUTPUT_FOLDER 2>&1 | tee $OUTPUT_FOLDER/build.log.tmp
$MOCK_BIN -v --configdir=$config_dir --rebuild $OUTPUT_FOLDER/*.src.rpm --no-cleanup-after --no-clean $extra_build_rpm_options --resultdir=$OUTPUT_FOLDER $MOCK_BIN -v --configdir=$config_dir --rebuild $OUTPUT_FOLDER/*.src.rpm --no-cleanup-after $extra_build_rpm_options --resultdir=$OUTPUT_FOLDER
rc=${PIPESTATUS[0]} rc=${PIPESTATUS[0]}
try_rebuild=false try_rebuild=false
if [[ $rc != 0 && $retry < $MAX_RETRIES ]] ; then if [[ $rc != 0 && $retry < $MAX_RETRIES ]] ; then