drop bootmanager:lxc_devel now that it's merged back in master/5.2

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 417f607..2479441 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -128,7 +128,7 @@ function failure() {
     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
@@ -157,7 +157,7 @@ function success () {
     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
@@ -710,13 +710,17 @@ function main () {
        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