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

use_extra_test on condition

Browse source
This commit is contained in:
root user 2019-03-13 20:41:13 +03:00
parent 6eeb26eafb
commit fe6e8af08d
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile.builder
View file

@ -4,7 +4,12 @@ RUN urpmi --auto --auto-update --no-verify-rpm \
&& rm -f /etc/localtime \
&& ln -s /usr/share/zoneinfo/UTC /etc/localtime \
&& urpmi.addmedia builder http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/main/testing/ \
&& urpmi --no-suggests --no-verify-rpm --auto mock-urpm git valgrind curl sudo builder-c xz timezone \
&& urpmi.addmedia debug_main_rel http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/debug_main/release/ \
&& urpmi.addmedia debug_main_up http://abf-downloads.rosalinux.ru/rosa2016.1/repository/x86_64/debug_main/updates/ \
&& urpmi.addmedia debug_builder http://abf-downloads.rosalinux.ru/rosa2016.1/container/2965189/x86_64/debug_main/release/ \
&& urpmi.addmedia debug_curl http://abf-downloads.rosalinux.ru/rosa2016.1/container/2961746/x86_64/debug_main/release/ \
&& urpmi.addmedia debug_ssl http://abf-downloads.rosalinux.ru/rosa2016.1/container/2963511/x86_64/debug_main/release/ \
&& urpmi --no-suggests --no-verify-rpm --auto mock-urpm git valgrind curl sudo builder-c xz timezone builder-c-debuginfo openssl-debuginfo curl-debuginfo \
&& sed -i 's!openmandriva.org!rosalinux.ru!g' /etc/builder-c/filestore_upload.sh \
&& sed -i 's!file-store!abf-n-file-store!g' /etc/builder-c/filestore_upload.sh \
&& sed -i -e "s/Defaults requiretty.*/ #Defaults requiretty/g" /etc/sudoers \
@ -17,5 +22,5 @@ RUN urpmi --auto --auto-update --no-verify-rpm \
&& rm -rf /usr/share/man/ /usr/share/cracklib /usr/share/doc
COPY builder.conf /etc/builder-c/
ENTRYPOINT ["/usr/bin/builder"]
#ENTRYPOINT ["/usr/bin/valgrind", "--undef-value-errors=no", "/usr/bin/builder"]
#ENTRYPOINT ["/usr/bin/builder"]
ENTRYPOINT ["/usr/bin/valgrind", "--undef-value-errors=no", "/usr/bin/builder"]

4
build-rpm.sh
View file

@ -387,7 +387,9 @@ if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then
fi
# Test RPM files
test_rpm
if [ "$use_extra_tests" = 'true' ]; then
test_rpm
fi
# End tests
}