#!/bin/bash
-REVISION=$(echo '$Revision: 18120 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
COMMANDPATH=$0
COMMAND=$(basename $0)
webpublish_cp_local_to_remote $LOG $WEBLOG
summary $LOG | webpublish_append_stdin_to_file $WEBLOG
if [ -n "$DO_TEST" ] ; then
+ short_message="PASS"
( \
echo "Successfully built and tested" ; \
echo "see build results at $WEBBASE_URL" ; \
) | webpublish_cp_stdin_to_file $WEBBASE.pass
webpublish rm -f $WEBBASE.pkg-ok $WEBBASE.ko
else
+ short_message="PKGOK"
( \
echo "Successful package-only build, no test requested" ; \
echo "see build results at $WEBBASE_URL" ; \
fi
if [ -n "$MAILTO" ] ; then
( \
- echo "Subject: PASS ${BASE} ${MAIL_SUBJECT}" ; \
+ echo "Subject: $short_message ${BASE} ${MAIL_SUBJECT}" ; \
echo "To: $MAILTO" ; \
echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
echo "see build results at $WEBBASE_URL" ; \
# toss the build in the bargain, so the tests don't need to mess with extracting it
rsync --verbose --archive /vservers/$BASE/build/MODULES/build ${testmaster_ssh}:${BASE}/
- # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
+ # invoke test on testbox - pass url and build url - so the tests can use vtest-initvm.sh
run_log_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
# need to proceed despite of set -e
function usage () {
echo "Usage: $COMMAND [option] [var=value...] make-targets"
- echo "This is $REVISION"
echo "Supported options"
echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
fi
# Create vserver
cd $tmpdir
- ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE}
+ ./vbuild-initvm.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE}
# cleanup
cd -
rm -rf $tmpdir
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)"
+ vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > Packages.gz)"
webpublish mkdir -p $WEBPATH/$BASE/DEBIAN
webpublish_rsync_files $WEBPATH/$BASE/DEBIAN/ /vservers/$BASE/build/DEBIAN/*.deb
- webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/DEBIAN/*.gz
+ webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/Packages.gz
fi
# publish myplc-release if this exists
release=/vservers/$BASE/build/myplc-release