set -x
# early stage ? - let's not create /build/@PLDISTRO@
if test -z "$WEBLOG" ; then
- WEBHOST=localhost
+ WEBHOST=$(hostname)
WEBPATH=/tmp
WEBBASE=/tmp/vbuild-early-$(date +%Y-%m-%d)
WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
( \
echo "Subject: KO ${BASE} ${MAIL_SUBJECT}" ; \
echo "To: $MAILTO" ; \
- echo "See full build log at $WEBBASE_URL/log.txt" ; \
- echo "and tail version at $WEBBASE_URL.ko" ; \
- echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ; \
+ echo "see build results at $WEBBASE_URL" ; \
+ echo "including full build log at $WEBBASE_URL/log.txt" ; \
+ echo "and complete test logs at $WEBBASE_URL/testlogs" ; \
echo "........................................" ; \
webpublish tail --lines=1000 $WEBLOG ) | \
sendmail $MAILTO
set -x
# early stage ? - let's not create /build/@PLDISTRO@
if test -z "$WEBLOG" ; then
- WEBHOST=localhost
+ WEBHOST=$(hostname)
WEBPATH=/tmp
WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
fi
if [ -n "$DO_TEST" ] ; then
( \
echo "Successfully built and tested" ; \
- echo "See full build log at $WEBBASE_URL/log.txt" ; \
- echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ; \
+ echo "see build results at $WEBBASE_URL" ; \
+ echo "including full build log at $WEBBASE_URL/log.txt" ; \
+ echo "and complete test logs at $WEBBASE_URL/testlogs" ; \
) | webpublish_cp_stdin_to_file $WEBBASE.pass
webpublish rm -f $WEBBASE.pkg-ok $WEBBASE.ko
else
( \
echo "Successful package-only build, no test requested" ; \
- echo "See full build log at $WEBBASE_URL/log.txt" ; \
+ echo "see build results at $WEBBASE_URL" ; \
+ echo "including full build log at $WEBBASE_URL/log.txt" ; \
) | webpublish_cp_stdin_to_file $WEBBASE.pkg-ok
webpublish rm -f $WEBBASE.ko
fi
echo "Subject: PASS ${BASE} ${MAIL_SUBJECT}" ; \
echo "To: $MAILTO" ; \
echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
- echo "See full build log at $WEBBASE_URL/log.txt" ; \
- [ -n "$DO_TEST" ] && echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ) \
+ echo "see build results at $WEBBASE_URL" ; \
+ echo "including full build log at $WEBBASE_URL/log.txt" ; \
+ [ -n "$DO_TEST" ] && echo "and complete test logs at $WEBBASE_URL/testlogs" ) \
| sendmail $MAILTO
fi
# XXX For some reason, we haven't been getting this email for successful builds. If this sleep
echo " -y {pl,pg} - passed to run_log"
echo " -e step - passed to run_log"
echo " -X : passes --lxc to run_log"
+ echo " -S : passes --vs to run_log"
echo " -x <run_log_args> - a hook to pass other arguments to run_log"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL; this is also used to get the hostname where to publish builds"
SIGNYUMREPO=""
OPTS_ORIG=$@
- OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:y:e:Xx:w:W:r:M:Yg:u:K:SBTnv7i:P:h" -l "build-branch:" -- $@)
+ OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:y:e:XSx:w:W:r:M:Yg:u:K:SBTnv7i:P:h" -l "build-branch:" -- $@)
if [ $? != 0 ]
then
usage
-y) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --rspec-style $2"; shift 2 ;;
# -e foo -> run_log -e foo
-e) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --exclude $2"; shift 2 ;;
- # -X -> run_log -X
+ # -X -> run_log --lxc
-X) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --lxc"; shift;;
+ # -S -> run_log --vs
+ -S) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --vs"; shift;;
# more general form to pass args to run_log
# -x foo -> run_log foo
-x) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS $2"; shift 2;;
set +e
webpublish rm -rf $WEBPATH/$BASE
# guess if we've been doing any debian-related build
- if [ ! -d /vservers/$BASE/DEBIAN ] ; then
+ if [ ! -f /vservers/$BASE/etc/debian_version ] ; then
webpublish mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
webpublish_rsync_dir $WEBPATH/$BASE/RPMS/ /vservers/$BASE/build/RPMS/
[[ -n "$PUBLISH_SRPMS" ]] && webpublish_rsync_dir $WEBPATH/$BASE/SRPMS/ /vservers/$BASE/build/SRPMS/
else
+ # run scanpackages so we can use apt-get on this
+ # (not needed on fedora b/c this is done by the regular build already)
+ vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > DEBIAN/Packages.gz)"
webpublish mkdir -p $WEBPATH/$BASE/DEBIAN
- webpublish_rsync_files $WEBPATH/$BASE/DEBIAN/ /vservers/$BASE/build/DEBIAN/*.deb
+ webpublish_rsync_files $WEBPATH/$BASE/DEBIAN/ /vservers/$BASE/build/DEBIAN/*.deb
+ webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/DEBIAN/*.gz
fi
# publish myplc-release if this exists
release=/vservers/$BASE/build/myplc-release