Changeset 72397 in vbox for trunk/src/VBox

Timestamp:

May 31, 2018 7:30:03 AM (7 years ago)

Author:

vboxsync

Message:

ValidationKit/utils/testExecService: Update vboxtxs-runvm readme and scripts. Adds dumping of nested-smoke test results to kernel log,
so we can see output on the test manager side.

Location:

trunk/src/VBox/ValidationKit/utils/TestExecServ

Files:

• linux/vboxtxs-runvm.sh (modified) (5 diffs)
• vboxtxs-runvm-readme.txt (modified) (1 diff)

trunk/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-runvm.sh

@@ -42 +42 @@
 CDROM_PATH=/media/cdrom
 SCRATCH_PATH=/tmp/vboxtxs-scratch
+SMOKEOUTPUT_PATH=/tmp/vboxtxs-smoketestoutput
+DEVKMSG_PATH=/dev/kmsg
 
 PIDFILE="/var/run/vboxtxs"
@@ -54 +56 @@
 fi
 
-begin_msg()
-{
-    test -n "${2}" && echo "${SCRIPTNAME}: ${1}."
-    logger -t "${SCRIPTNAME}" "${1}."
+kernlog_msg() {
+    test -n "$2" && echo "${SCRIPTNAME}: ${1}"
+    echo "${SCRIPTNAME}: ${1}" > $DEVKMSG_PATH
 }
 
-succ_msg()
-{
-    logger -t "${SCRIPTNAME}" "${1}."
+dumpfile_to_kernlog() {
+    if test -f "$1"; then
+        kernlog_msg "---------------------- DUMP BEGIN ----------------------"
+        cat "$1" | while read LINE
+        do
+            kernlog_msg "${LINE}"
+        done
+        kernlog_msg "---------------------- DUMP END ------------------------"
+        rm -f "$1"
+    else
+        kernlog_msg "${1}: file not found" console
+    fi
 }
 
-fail_msg()
+killproc()
 {
-    echo "${SCRIPTNAME}: failed: ${1}." >&2
-    logger -t "${SCRIPTNAME}" "failed: ${1}."
-}
-
-killproc() {
     kp_binary="${1##*/}"
     pkill "${kp_binary}" || return 0
@@ -112 +117 @@
 start() {
     if ! test -f $PIDFILE; then
-        begin_msg "Starting VirtualBox Nested Hardware-Virtualization Smoke Test" console
+        kernlog_msg "Starting Nested Smoke Test" console
         fixAndTestBinary
         testRsrcPath
         sleep 5
-        $PYTHON_BINARY $SMOKETEST_SCRIPT -v -v -d --vbox-session-type gui --quick all
+        $PYTHON_BINARY $SMOKETEST_SCRIPT -v -v -d --vbox-session-type gui --quick all 1> "${SMOKEOUTPUT_PATH}" 2>&1
         RETVAL=$?
+        dumpfile_to_kernlog "${SMOKEOUTPUT_PATH}"
         if test $RETVAL -eq 0; then
-            begin_msg "Starting VirtualBox Test Execution service" console
+            kernlog_msg "Starting VirtualBox Test Execution service" console
             mount /dev/cdrom "${CDROM_PATH}" 2> /dev/null > /dev/null
             $binary --auto-upgrade --scratch="${SCRATCH_PATH}" --cdrom="${CDROM_PATH}" --no-display-output > /dev/null
             RETVAL=$?
-            test $RETVAL -eq 0 && sleep 2 && echo `pidof TestExecService` > $PIDFILE
+            test $RETVAL -eq 0 && sleep 3 && echo `pidof TestExecService` > $PIDFILE
             if ! test -s "${PIDFILE}"; then
                 RETVAL=5
             fi
-        fi
-        if test $RETVAL -eq 0; then
-            succ_msg "VirtualBox Test Execution service started"
+            if test $RETVAL -eq 0; then
+                kernlog_msg "Test Execution service started" console
+            else
+                kernlog_msg "Test Execution service failed to start" console
+            fi
         else
-            fail_msg "VirtualBox Test Execution service failed to start"
+            kernlog_msg "Smoke Test failed! error code ${RETVAL}" console
+            RETVAL=7
         fi
     fi
@@ -139 +148 @@
 stop() {
     if test -f $PIDFILE; then
-        begin_msg "Stopping VirtualBox Test Execution Service" console
+        kernlog_msg "Stopping VirtualBox Test Execution Service"
         killproc $binary
+        rm -f $PIDFILE
     fi
 }
@@ -180 +190 @@
 
 exit $RETVAL
+

trunk/src/VBox/ValidationKit/utils/TestExecServ/vboxtxs-runvm-readme.txt

@@ -25 +25 @@
     Enable the vboxtxs-runvm service, usually using:
        systemctl enable vboxtxs-runvm
-8.  Check the cdrom location in /opt/validationkit/linux/vboxtxs-runvm and fix
-    it so it's correct.
+8.  Check the cdrom location and /dev/kmsg equivalent of your linux distro
+    in /opt/validationkit/linux/vboxtxs-runvm and fix it so it's correct.
 9.  reboot / done.