fix broken pkgs.py

[build.git] / lbuild-nightly.sh

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 1d115e9..e69924c 100755 (executable)
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -11,10 +11,10 @@ COMMAND=$(basename $0)
 export PATH=$PATH:/bin:/sbin
 
 # default values, tunable with command-line options
-DEFAULT_FCDISTRO=f31
+DEFAULT_FCDISTRO=f41
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
-DEFAULT_MAILDEST="build at onelab.eu"
+DEFAULT_MAILDEST="thierry.parmentelat at inria.fr"
 DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build"
 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
 
@@ -57,13 +57,38 @@ function logfile () {
 # 1st version was relying on virsh net-dhcp-leases
 # however this was too fragile, would not work for fedora14 containers
 # WARNING: this code is duplicated in lbuild-initvm.sh
+function guest_ipv4_old() {
+    lxc=$1; shift
+
+    mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
+    [ -z "$mac" ] && { echo 1>&2 guest_ipv4_old cannot find mac; return 1; }
+    ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    # if not known: run a ping and try again
+    if [ -z $ip ]; then
+           ping -c1 -w1 -W1 $lxc >& /dev/null
+           ping -c1 -w1 -W1 $lxc.pl.sophia.inria.fr >& /dev/null
+           ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    fi
+    [ -z "$ip" ] && { echo 1>&2 guest_ipv4_old cannot find ip; return 1; }
+    echo $ip
+}
+
 function guest_ipv4() {
     lxc=$1; shift
 
-    mac=$(virsh -c lxc:/// domiflist $lxc | egrep 'network|bridge' | awk '{print $5;}')
-    # sanity check
-    [ -z "$mac" ] && return 0
-    arp -en | grep "$mac" | awk '{print $1;}'
+    # this gives us the libvirt_lxc pid for the container
+    local lxc_pid=$(virsh -c lxc:/// dominfo $lxc | grep '^Id:' | awk '{print $2;}' | sed -e "s|-||g")
+    [[ -z "$lxc_pid" ]] && { echo 1>&2 guest_ipv4 cannot find lxc pid; return 1; }
+    # but we need the systemd (pid=1) instance for the container
+    local systemd_pid=$(pgrep -P $lxc_pid systemd)
+    [[ -z "$systemd_pid" ]] && { echo 1>&2 guest_ipv4 cannot systemd pid; return 1; }
+    # from there we can inspect the network interfaces
+    local domip=$(nsenter -t $systemd_pid -n ip -br addr show eth0 \
+                 | awk '{print $3}' \
+                 | cut -d/ -f1 \
+                 )
+    [ -z "$domip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; }
+    echo $domip
 }
 
 # wrap a quick summary of suspicious stuff
@@ -72,18 +97,23 @@ function guest_ipv4() {
 function summary () {
     from=$1; shift
     echo "******************** BEG SUMMARY"
-    python3 - $from <<EOF
-#!/usr/bin/env python3
+    python - $from <<EOF
 # read a full log and tries to extract the interesting stuff
 
 import sys, re
 m_show_line = re.compile(
-".* (BEG|END) (RPM|LXC).*|.*'boot'.*|\* .*| \* .*|.*is not installed.*|.*PROPFIND.*|.* (BEG|END).*:run_log.*|.* Within LXC (BEG|END) .*|.* MAIN (BEG|END).*")
-m_installing_any = re.compile('\r  (Installing:[^\]]*]) ')
-m_installing_err = re.compile('\r  (Installing:[^\]]*])(..+)')
-m_installing_end = re.compile('Installed:.*')
-m_installing_doc1 = re.compile("(.*)install-info: No such file or directory for /usr/share/info/\S+(.*)")
-m_installing_doc2 = re.compile("(.*)grep: /usr/share/info/dir: No such file or directory(.*)")
+r".* (BEG|END) (RPM|LXC).*|.*'boot'.*|\* .*| \* .*"
+"|.*is not installed.*"
+"|.*PROPFIND.*"
+"|.* (BEG|END).*:run_log.*"
+"|.* Within LXC (BEG|END) .*"
+"|.* MAIN (BEG|END).*"
+)
+m_installing_any = re.compile(r"\r  (Installing:[^\]]*]) ")
+m_installing_err = re.compile(r"\r  (Installing:[^\]]*])(..+)")
+m_installing_end = re.compile(r"Installed:.*")
+m_installing_doc1 = re.compile(r"(.*)install-info: No such file or directory for /usr/share/info/\S+(.*)")
+m_installing_doc2 = re.compile(r"(.*)grep: /usr/share/info/dir: No such file or directory(.*)")
 
 def summary (filename):
 
@@ -333,7 +363,8 @@ function run_log () {
     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}