export PATH=$PATH:/bin:/sbin
# default values, tunable with command-line options
-DEFAULT_FCDISTRO=f29
+DEFAULT_FCDISTRO=f35
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MAILDEST="build at onelab.eu"
### we might build on a box other than the actual web server
# utilities for handling the pushed material (rpms, logfiles, ...)
-function webpublish_misses_dir () { ssh root@${WEBHOST} "bash -c \"test \! -d $1\"" ; }
-function webpublish () { ssh root@${WEBHOST} "$@" ; }
-function webpublish_cp_local_to_remote () { scp $1 root@${WEBHOST}:$2 ; }
-function webpublish_cp_stdin_to_file () { ssh root@${WEBHOST} cat \> $1; }
-function webpublish_append_stdin_to_file () { ssh root@${WEBHOST} cat \>\> $1; }
-# provide remote dir as first argument, so any number of local files can be passed next
+function webpublish_misses_dir () {
+ ssh root@${WEBHOST} "bash -c \"test \! -d $1\""
+}
+function webpublish () {
+ ssh root@${WEBHOST} "$@"
+}
+function webpublish_cp_stdin_to_file () {
+ ssh root@${WEBHOST} cat \> $1 \; chmod g+r,o+r $1
+}
+function webpublish_append_stdin_to_file () {
+ ssh root@${WEBHOST} cat \>\> $1 \; chmod g+r,o+r $1
+}
+# provide remote dir as first argument,
+# so any number of local files can be passed next
function webpublish_rsync () {
local remote="$1"; shift
rsync --archive --delete $VERBOSE "$@" root@${WEBHOST}:"$remote"
WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
fi
webpublish mkdir -p $WEBBASE ||:
- webpublish_cp_local_to_remote $LOG $WEBLOG ||:
+ webpublish_rsync $WEBLOG $LOG ||:
summary $LOG | webpublish_append_stdin_to_file $WEBLOG ||:
(echo -n "============================== $COMMAND: failure at " ; date ; \
webpublish tail --lines=1000 $WEBLOG) | \
WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
fi
webpublish mkdir -p $WEBBASE
- webpublish_cp_local_to_remote $LOG $WEBLOG
+ webpublish_rsync $WEBLOG $LOG
summary $LOG | webpublish_append_stdin_to_file $WEBLOG
if [ -n "$DO_TEST" ] ; then
short_message="PASS"
ssh -n ${testmaster_ssh} rm -rf ${testdir} ${testdir}.git
# check it out in the build
- run_in_build_guest $BASE make -C /build tests-module ${MAKEVARS[@]}
+ # as well as build that might not be here esp. in a short build
+ run_in_build_guest $BASE make -C /build tests-module build-module ${MAKEVARS[@]}
# push it onto the testmaster - just the 'system' subdir is enough
rsync --verbose --archive $(rootdir $BASE)/build/MODULES/tests/system/ ${testmaster_ssh}:${BASE}
# guess if we've been doing any debian-related build
if [ ! -f $(rootdir $BASE)/etc/debian_version ] ; then
webpublish mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
+ # after moving to f29, we see this dir created as 700
+ # as remote umask is 077
+ webpublish chmod 755 $WEBPATH/$BASE
webpublish_rsync $WEBPATH/$BASE/RPMS/ $(rootdir $BASE)/build/RPMS/
[[ -n "$PUBLISH_SRPMS" ]] && webpublish_rsync $WEBPATH/$BASE/SRPMS/ $(rootdir $BASE)/build/SRPMS/
else