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

put pipestatus back, disable cache

Browse source
This commit is contained in:
Alexander Stefanov 2019-07-03 12:42:19 +03:00
parent 6127663214
commit e6285e64a0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build-rpm.sh
View file

@ -290,15 +290,15 @@ 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]}
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
rc=${PIPESTATUS[0]}
python /mdv/check_arch.py "${OUTPUT_FOLDER}"/*.src.rpm ${platform_arch}
if [[ $? -ne 0 ]]; then exit 6; fi
fi
try_rebuild=false

2
config-generator.sh
View file

@ -32,7 +32,7 @@ config_opts['urpm_options'] = '$extra_cfg_urpm_options'
config_opts['root'] = '$platform_name-$platform_arch'
config_opts['chroot_setup'] = 'basesystem-minimal basesystem-build xz timezone'
#config_opts['urpm_options'] = '--xml-info=never $extra_cfg_urpm_options'
config_opts['plugin_conf']['root_cache_enable'] = True
config_opts['plugin_conf']['root_cache_enable'] = False
config_opts['plugin_conf']['root_cache_opts']['age_check'] = True
config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 1
config_opts['plugin_conf']['ccache_enable'] = False