Merge lp:~sil2100/otto/autopilot_add_setup_upstart_job into lp:otto

[Łukasz Zemczak]

Add the otto-autopilot-setup.conf upstart job for configuring autopilot users correctly

Add the otto-autopilot-setup.conf upstart job for configuring autopilot users correctly. It seems that python-autopilot prepares the autopilot group, but it only adds the currently logged in user (we don't have that). So, to fix permissions, we need to add ubuntu to autopilot automatically. Otherwise, /dev/uinput is inaccessible.

[lp:~sil2100/otto/autopilot_add_setup_upstart_job]

39. By Łukasz Zemczak on 2013-06-24

Remove unnecessary elements

40. By Łukasz Zemczak on 2013-06-24

Add a check for existence of autopilot and ubuntu

41. By Łukasz Zemczak on 2013-06-24

Final improvements (I hope)

Unmerged revisions

41. By Łukasz Zemczak on 2013-06-24

Final improvements (I hope)

40. By Łukasz Zemczak on 2013-06-24

Add a check for existence of autopilot and ubuntu

39. By Łukasz Zemczak on 2013-06-24

Remove unnecessary elements

38. By Łukasz Zemczak on 2013-06-24

Add the otto-autopilot-setup.conf upstart job for configuring autopilot users correctly

37. By Jean-Baptiste Lallement on 2013-06-18

Use basename instead of full path for lockfile name

36. By Didier Roche-Tolomelli on 2013-06-18

add saucy-proposed only to saucy

35. By Jean-Baptiste Lallement on 2013-06-18

Enabled proposed for saucy

34. By Jean-Baptiste Lallement on 2013-06-18

* capture_procstat:
  - Kill subprocess on exit
  - Do not run multiple instances
* run-autopilot.sh:
  - Capture memory usage

33. By Jean-Baptiste Lallement on 2013-06-17

Added script to capture ps periodically

32. By Didier Roche-Tolomelli on 2013-06-10

ok, let's record now on intel and ati

=== added file 'config'
--- config	1970-01-01 00:00:00 +0000
+++ config	2013-06-24 12:57:44 +0000
@@ -0,0 +1,2 @@
+LOGFILES="/var/log/syslog /home/ubuntu/.xsession-errors /home/ubuntu/.cache/upstart/gnome-session.log /var/local/autopilot/autopilot.log"
+ARTIFACTS="/var/local/autopilot /var/crash"
 
=== added directory 'hooks'
=== added file 'hooks/setup'
--- hooks/setup	1970-01-01 00:00:00 +0000
+++ hooks/setup	2013-06-24 12:57:44 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh -eu
+#
+# Customize the test tree _before_ the container starts and the
+# testsuite directory is copied to $rootfs
+echo "I: Executing $0"
+
+if [ $# -eq 0 ]; then
+    echo "W: Testsuite path not found. Setup skipped!"
+    exit 0
+fi
+
+TESTPATH=$1
+
+if [ ! -d "$TESTPATH" ]; then
+    echo "W: Testsuite path '$TESTPATH' not found. Setup skipped!"
+    exit 0
+fi
+
+TESTSUITES=$TESTPATH/target-override/var/local/autopilot/testsuites
+mkdir -p $(dirname $TESTSUITES)
+# $TESTS is passed in the environment
+TESTS="${TESTS:-}"
+echo "$TESTS" > $TESTSUITES
+
 
=== added directory 'packages'
=== added directory 'packages/saucy'
=== added file 'packages/saucy/proposed.repo'
--- packages/saucy/proposed.repo	1970-01-01 00:00:00 +0000
+++ packages/saucy/proposed.repo	2013-06-24 12:57:44 +0000
@@ -0,0 +1,1 @@
+deb http://archive.ubuntu.com/ubuntu/ saucy-proposed main universe restricted multiverse
 
=== added directory 'target-override'
=== added directory 'target-override/etc'
=== added directory 'target-override/etc/init'
=== added file 'target-override/etc/init/otto-autopilot-setup.conf'
--- target-override/etc/init/otto-autopilot-setup.conf	1970-01-01 00:00:00 +0000
+++ target-override/etc/init/otto-autopilot-setup.conf	2013-06-24 12:57:44 +0000
@@ -0,0 +1,15 @@
+description "Setup evnivonment specific to the autopilot jobs for otto"
+author "Łukasz 'sil2100' Zemczak <[e-mail]>"
+
+start on starting lightdm
+
+env DEBIAN_FRONTEND=noninteractive
+
+pre-start script
+    # Add the ubuntu user to the autopilot group, as only the autopilot group
+    # has the required permissions to access /dev/uinput
+    echo "Adding the ubuntu user to the autopilot group"
+    usermod -a -G autopilot ubuntu
+
+    exit_job 0
+end script
 
=== added directory 'target-override/etc/xdg'
=== added directory 'target-override/etc/xdg/autostart'
=== added file 'target-override/etc/xdg/autostart/autopilot.desktop'
--- target-override/etc/xdg/autostart/autopilot.desktop	1970-01-01 00:00:00 +0000
+++ target-override/etc/xdg/autostart/autopilot.desktop	2013-06-24 12:57:44 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Fire-up Autopilot tests
+Comment=Starts the Autopilot tests
+Exec=/usr/local/bin/run-autopilot.sh
+Terminal=false
+Type=Application
+Categories=
+X-GNOME-Autostart-Delay=20
 
=== added directory 'target-override/usr'
=== added directory 'target-override/usr/local'
=== added directory 'target-override/usr/local/bin'
=== added file 'target-override/usr/local/bin/capture_procstat'
--- target-override/usr/local/bin/capture_procstat	1970-01-01 00:00:00 +0000
+++ target-override/usr/local/bin/capture_procstat	2013-06-24 12:57:44 +0000
@@ -0,0 +1,112 @@
+#!/bin/sh -e
+
+#
+# This script sends a signal to psd periodically to capture ps data
+#
+
+# Copyright © 2013 Canonical Ltd.
+# Author: Jean-baptiste Lallement <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+COUNT=-1
+INTERVAL=1
+DATAFILE=""
+COLLECTEXE=$(dirname $(readlink -f $0))/psd
+
+if [ ! -x $COLLECTEXE ]; then
+    echo "E: File not found: $COLLECTEXE. Exiting!"
+    exit 1
+fi
+
+# Do not run multiple instances
+lockfilename="/var/lock/$(basename $0)"
+if [ -z "$FLOCK_SET" ] ; then
+    exec env FLOCK_SET=1 flock -n "${lockfilename}" "$0" "$@"
+fi
+
+usage() {
+    cat<<EOF
+Usage: $(basename $0) [options] [interval [count]]
+Collect information about processes and memory on a sampling period of length
+interval and count samples.
+If count is not specified, default is infinite.
+Default interval is ${INTERVAL}s .
+
+Options:
+    -h|--help       This help
+    -d|--debug      Enable debug mode
+    -o|--output filename
+                    Output file (default stdout)
+EOF
+    exit 1
+}
+
+on_exit() {
+    if [ -f "$TMPDATAFILE" ]; then
+        if [ -n "$DATAFILE" ]; then
+            mv $TMPDATAFILE $DATAFILE
+            echo "I: Finished. Data stored in $DATAFILE"
+        else
+            cat $TMPDATAFILE
+            rm $TMPDATAFILE
+        fi
+    fi
+    kill -9 $CPID >/dev/null 2>&1||true
+    exit 0
+}
+
+SOPTS="hdc:n:o:"
+LOPTS="help,debug,count:,interval:,output:"
+TEMP=$(getopt -o $SOPTS --long $LOPTS -- "$@")
+eval set -- "$TEMP"
+
+while true ; do
+    case "$1" in
+        -h|--help) 
+            usage;;
+        -d|--debug)
+            set -x
+            shift;;
+        -o|--output)
+            DATAFILE=$2
+            shift 2;;
+        --) shift ; break ;;
+        *) usage;;
+    esac
+done
+
+[ $# -gt 0 ] && INTERVAL=$1 && shift
+[ $# -gt 0 ] && COUNT=$1 && shift
+
+trap on_exit EXIT INT QUIT ABRT PIPE TERM
+
+TMPDATAFILE=$(mktemp /tmp/$(basename $0).XXXXXX)
+[ -n "$DATAFILE" ] && mkdir -p $(dirname $DATAFILE)
+
+if [ $COUNT -ge 0 ];then
+    MSGCNT="$COUNT samples"
+else
+    MSGCNT="samples until interrupted"
+fi
+echo "I: Capturing  $MSGCNT with a sampling rate of ${INTERVAL}s"
+$COLLECTEXE $TMPDATAFILE&
+CPID=$!
+sleep .5
+while [ $COUNT -ne 0 ]; do
+    kill -10 $CPID
+    [ $COUNT -gt 0 ] && COUNT=$((COUNT - 1))
+    sleep $INTERVAL
+done
 
=== added file 'target-override/usr/local/bin/psd'
--- target-override/usr/local/bin/psd	1970-01-01 00:00:00 +0000
+++ target-override/usr/local/bin/psd	2013-06-24 12:57:44 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+#
+# This script dumps ps data on SIGUSR1
+#
+
+# Copyright © 2013 Canonical Ltd.
+# Author: Jean-baptiste Lallement <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+DATAFILE=$1
+rm -f $DATAFILE
+
+PSOPTS="-e --no-headers -ww" 
+PSFIELDS="uid,pid,ppid,pgid,stat,rss,vsz,cputime,etimes,cmd"
+PSSORTBY="+pgid,ppid,pid"
+
+[ -n "$PSFIELDS" ] && PSOPTS="$PSOPTS -o $PSFIELDS"
+[ -n "$PSSORTBY" ] && PSOPTS="$PSOPTS --sort $PSSORTBY"
+
+capture() {
+    echo "TS:$(date +%s.%N)">>$DATAFILE
+    ps $PSOPTS >>$DATAFILE
+}
+trap capture USR1
+
+while :; do
+    sleep .1
+done
 
=== added file 'target-override/usr/local/bin/run-autopilot.sh'
--- target-override/usr/local/bin/run-autopilot.sh	1970-01-01 00:00:00 +0000
+++ target-override/usr/local/bin/run-autopilot.sh	2013-06-24 12:57:44 +0000
@@ -0,0 +1,109 @@
+#!/bin/sh -eu
+
+#
+# This script runs autopilot
+#
+
+# Copyright © 2013 Canonical Ltd.
+# Author: Jean-baptiste Lallement <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+# Required to display stdout in ~/.xsession-error
+
+TESTBASE=/var/local/autopilot/
+AP_ARTIFACTS=$TESTBASE/videos/
+AP_RESULTS=$TESTBASE/junit/
+AP_TESTSUITES=$TESTBASE/testsuites
+AP_LOGFILE=$TESTBASE/autopilot.log
+SPOOLDIR=$TESTBASE/spool
+AP_OPTS="-v -r -rd $AP_ARTIFACTS -f xml"
+# TESTING ONLY -- REcording is disabled
+#AP_OPTS="-v -f xml"
+OTTO_SUMMARY=/var/local/otto/summary.log
+MEMUSAGE_CMD=/usr/local/bin/capture_procstat
+
+# Define general configuration files 
+[ -f $TESTBASE/config ] && . $TESTBASE/config
+
+setup_tests() {
+    # Prepares the environment for the tests
+    flag=$HOME/.ap_setup_done
+
+    [ -e "$flag" ] && return 0
+
+    # Disable notifications and screensaver
+    gsettings set com.ubuntu.update-notifier show-apport-crashes false
+    gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+
+    # Loads the list of test and queue them in test spool
+    sudo mkdir -p $SPOOLDIR $AP_ARTIFACTS $AP_RESULTS $(dirname $OTTO_SUMMARY)
+    sudo chown -R $USER:$USER $TESTBASE $SPOOLDIR $AP_ARTIFACTS $AP_RESULTS $(dirname $OTTO_SUMMARY)
+
+    if [ -e "$AP_TESTSUITES" ]; then
+        (cd $SPOOLDIR; touch $(cat $AP_TESTSUITES))
+    fi
+    touch $flag
+}
+
+run_tests() {
+    # Runs all the tests in spooldir
+    #
+    # $1: Spool directory
+    spooldir=$1
+    if [ ! -d $spooldir ]; then
+        echo "E: '$spooldir is not a directory. Exiting!"
+        exit 1
+    fi
+
+    if ! which autopilot >/dev/null 2>&1; then
+        echo "E: autopilot is required to run autopilot tests"
+        echo "autopilot_installed (see autopilot.log for details): ERROR" >> $OTTO_SUMMARY
+        sudo shutdown -h now
+        exit 1
+    fi
+    echo "autopilot_installed: PASS" >> $OTTO_SUMMARY
+
+    exec >>$AP_LOGFILE
+    exec 2>&1
+
+    # Capture memusage
+    $MEMUSAGE_CMD -o $TESTBASE/memusage.log 1 &
+    [ $? -gt 0 ] && echo "W: Failed to start $MEMUSAGE_CMD ."
+
+    for testfile in $(ls -d $spooldir/* 2>/dev/null); do
+        testname=$(basename $testfile)
+        # We don't want to fail if AP fail but we want the return code
+        set +e  
+        echo "I: Running autopilot run $testname $AP_OPTS -o $AP_RESULTS/$testname.xml"
+        autopilot run $testname $AP_OPTS -o $AP_RESULTS/$testname.xml 
+        AP_RC=$?
+        if [ $AP_RC -gt 0 ]; then
+            echo "${testname}: FAIL" >> $OTTO_SUMMARY
+        else
+            echo "${testname}: DONE" >> $OTTO_SUMMARY
+        fi
+        set -e
+        sudo rm -f $testfile
+    done
+
+    if [ ! "$(ls -A $spooldir/)" ]; then
+        echo "I: No test left to run"
+        sudo shutdown -h now
+    fi
+}
+
+setup_tests
+run_tests $SPOOLDIR
 
=== added directory 'target-override/var'
=== added directory 'target-override/var/lib'
=== added directory 'target-override/var/lib/otto'