diff mbox

[Xen-devel,OSSTEST,2/2] standalone mode convenience frontend

Message ID 1395332482-5892-2-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell March 20, 2014, 4:21 p.m. UTC 
I can never remember all the various env vars which I can/should set so this
tool provides a command line veneer over the basics.

It also does some sanity checks for things which keep tripping me up
(inability to read apache logs, lack of ssh-agent) which fail in more or less
obscure ways.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 standalone | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100755 standalone

Comments

Ian Jackson March 20, 2014, 4:31 p.m. UTC | #1 
Ian Campbell writes ("[PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> I can never remember all the various env vars which I can/should set so this
> tool provides a command line veneer over the basics.
> 
> It also does some sanity checks for things which keep tripping me up
> (inability to read apache logs, lack of ssh-agent) which fail in more or less
> obscure ways.

This seems useful.  I have only a couple of trivial style comments.


> +        env DAILY_BRANCH_PREEXEC_HOOK=exit\ 0 \
> +            OSSTEST_USE_HEAD=y \
> +            BRANCHES_ALWAYS="$branch" \
> +            OSSTEST_FLIGHT=$flight \
> +            OSSTEST_CONFIG=$config \
> +            OSSTEST_NO_BASELINE=y \
> +                ./cr-daily-branch $@ $branch

The use of "env" here is unnecessary.

...
> +		./sg-run-job $job 2>&1 | tee logs/$flight/$job.log
> +	rc=${PIPESTATUS[0]}
> +	if [ $rc -ne 0 ] ; then
> +	    echo "FAILED rc=${rc}" >&2
> +	fi

These 4.5 lines occur twice in this file.  Perhaps another subroutine
to handle the logging ?

Thanks,
Ian.
Ian Campbell March 20, 2014, 4:34 p.m. UTC | #2 
On Thu, 2014-03-20 at 16:31 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> > I can never remember all the various env vars which I can/should set so this
> > tool provides a command line veneer over the basics.
> > 
> > It also does some sanity checks for things which keep tripping me up
> > (inability to read apache logs, lack of ssh-agent) which fail in more or less
> > obscure ways.
> 
> This seems useful.  I have only a couple of trivial style comments.
> 
> 
> > +        env DAILY_BRANCH_PREEXEC_HOOK=exit\ 0 \
> > +            OSSTEST_USE_HEAD=y \
> > +            BRANCHES_ALWAYS="$branch" \
> > +            OSSTEST_FLIGHT=$flight \
> > +            OSSTEST_CONFIG=$config \
> > +            OSSTEST_NO_BASELINE=y \
> > +                ./cr-daily-branch $@ $branch
> 
> The use of "env" here is unnecessary.

Yes, I wonder what was happening to cause me to think I needed it...

> ...
> > +		./sg-run-job $job 2>&1 | tee logs/$flight/$job.log
> > +	rc=${PIPESTATUS[0]}
> > +	if [ $rc -ne 0 ] ; then
> > +	    echo "FAILED rc=${rc}" >&2
> > +	fi
> 
> These 4.5 lines occur twice in this file.  Perhaps another subroutine
> to handle the logging ?

Sure. Unless the subroutine call is going to muck with ${PIPSTATUS[0]}
somehow -- I need to check that.

Ian.
Ian Jackson March 20, 2014, 4:39 p.m. UTC | #3 
Ian Campbell writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> On Thu, 2014-03-20 at 16:31 +0000, Ian Jackson wrote:
> > > +		./sg-run-job $job 2>&1 | tee logs/$flight/$job.log
> > > +	rc=${PIPESTATUS[0]}
> > > +	if [ $rc -ne 0 ] ; then
> > > +	    echo "FAILED rc=${rc}" >&2
> > > +	fi
> > 
> > These 4.5 lines occur twice in this file.  Perhaps another subroutine
> > to handle the logging ?
> 
> Sure. Unless the subroutine call is going to muck with ${PIPSTATUS[0]}
> somehow -- I need to check that.

I was thinking of a subroutine you'd use like this:

    BLAH1=1 BLAH2=2 BLAH3=3 with-logging ./sg-run-job $job

Ian.
Ian Jackson March 20, 2014, 4:39 p.m. UTC | #4 
Ian Jackson writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> Ian Campbell writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> > Sure. Unless the subroutine call is going to muck with ${PIPSTATUS[0]}
> > somehow -- I need to check that.
> 
> I was thinking of a subroutine you'd use like this:
> 
>     BLAH1=1 BLAH2=2 BLAH3=3 with-logging ./sg-run-job $job

Or rather

   BLAH1=1 BLAH2=2 BLAH3=3 with-logging logs/$flight/$job.log ./sg-run-job $job

or some such.

Ian.
Ian Campbell March 20, 2014, 4:40 p.m. UTC | #5 
On Thu, 2014-03-20 at 16:39 +0000, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> > On Thu, 2014-03-20 at 16:31 +0000, Ian Jackson wrote:
> > > > +		./sg-run-job $job 2>&1 | tee logs/$flight/$job.log
> > > > +	rc=${PIPESTATUS[0]}
> > > > +	if [ $rc -ne 0 ] ; then
> > > > +	    echo "FAILED rc=${rc}" >&2
> > > > +	fi
> > > 
> > > These 4.5 lines occur twice in this file.  Perhaps another subroutine
> > > to handle the logging ?
> > 
> > Sure. Unless the subroutine call is going to muck with ${PIPSTATUS[0]}
> > somehow -- I need to check that.
> 
> I was thinking of a subroutine you'd use like this:
> 
>     BLAH1=1 BLAH2=2 BLAH3=3 with-logging ./sg-run-job $job

Ah, yes, that does look good. I'll do that.

Ian.
Ian Campbell March 20, 2014, 4:42 p.m. UTC | #6 
On Thu, 2014-03-20 at 16:39 +0000, Ian Jackson wrote:
> Ian Jackson writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> > Ian Campbell writes ("Re: [PATCH OSSTEST 2/2] standalone mode convenience frontend"):
> > > Sure. Unless the subroutine call is going to muck with ${PIPSTATUS[0]}
> > > somehow -- I need to check that.
> > 
> > I was thinking of a subroutine you'd use like this:
> > 
> >     BLAH1=1 BLAH2=2 BLAH3=3 with-logging ./sg-run-job $job
> 
> Or rather
> 
>    BLAH1=1 BLAH2=2 BLAH3=3 with-logging logs/$flight/$job.log ./sg-run-job $job
> 
> or some such.

Right, I'd have probably got that once I came to actually type it in...

Ian.
diff mbox

Patch

diff --git a/standalone b/standalone
new file mode 100755
index 0000000..00fb707
--- /dev/null
+++ b/standalone
@@ -0,0 +1,231 @@ 
+#!/bin/bash
+
+set -e
+
+usage() {
+    cat >&2 <<EOF
+usage: standalone [operations] [options...]
+
+Operations:
+
+* make-flight [cf] [BRANCH]
+
+  Create a flight testing the named branch.
+
+* set-paths [cf] [JOB]
+
+  Setup dist path runvars for JOB from existing build results. Useful
+  after recreating a flight to avoid the need to rebuild.
+
+* run-job [cfhrR] [JOB]
+
+  Run the named JOB.
+
+  Required options: -h HOST
+
+* run-test [cfhrR] [JOB] [TEST]
+
+  Run the named TEST as part of JOB.
+
+  Required options: -h HOST
+
+Options:
+
+-c FILE, --config=FILE        Use FILE as configuration file
+-f FLIGHT, --flight=FLIGHT    Operate on FLIGHT
+-h HOST, --host=HOST          Test host
+-r, --reuse                   Do not wipe test host (default)
+-R, --noreuse, --noreinstall  Wipe the test host (if job or test does so)
+
+--help                        This message
+
+EOF
+}
+
+if [ $# -lt 1 ] ; then
+    echo "Need an operation" >&2
+    usage
+    exit 1
+fi
+
+op=$1 ; shift
+
+if [ x$op = x--help ] ; then
+    usage
+    exit 0
+fi
+
+TEMP=$(getopt -o c:f:h:rR --long config:,flight:,host:,reuse,noreuse,reinstall,help -- "$@")
+
+eval set -- "$TEMP"
+
+config=
+flight="standalone"
+host=
+reuse=1 # Don't blow away machines by default
+
+while true ; do
+    case "$1" in
+	-c|--config) config=$2; shift 2;;
+	-f|--flight) flight=$2; shift 2;;
+	-h|--host)   host=$2;   shift 2;;
+	-r|--reuse)  reuse=1;   shift 1;;
+	-R|--noreuse|--reinstall)reuse=0;shift 1;;
+	--help)      usage; exit 0;;
+        --) shift ; break ;;
+        *) echo "Internal error!" ; exit 1 ;;
+
+    esac
+done
+
+if [ ! -r /var/log/apache2/access.log ] ; then
+    echo "WARNING: Cannot read apache logs. Some tests may fail" >&2
+fi
+
+if ! ssh-add -l >/dev/null ] ; then
+    echo "WARNING: Unable to access ssh-agent. Some tests may fail" >&2
+fi
+
+if [ $reuse -eq 0 ]; then
+    echo "WARNING: Will blow away machine..."
+    echo "Press ENTER to confirm."
+    read
+fi
+
+if [ ! -f standalone.db ] ; then
+    echo "No standalone.db? Run standalone-reset." >&2
+    exit 1
+fi
+
+need_flight() {
+    if [ -z "$flight" ] ; then
+	echo "run-job: Need a flight" >&2
+	exit 1
+    fi
+}
+need_host() {
+    if [ -z "$host" ] ; then
+	echo "run-job: Need a host" >&2
+	exit 1
+    fi
+}
+
+ensure_logs() {
+    if [ ! -d "logs" ] ; then
+	mkdir "logs"
+    fi
+    if [ ! -d "logs/$flight" ] ; then
+	mkdir "logs/$flight"
+    fi
+}
+
+# other potential ops:
+# - run standalone reset
+
+case $op in
+    help)
+        usage
+	exit 0
+	;;
+
+    make-flight)
+        need_flight
+
+        if [ $# -lt 1 ] ; then
+            echo "make-flight: Need branch" >&2
+            exit 1
+        fi
+
+        branch=$1; shift
+
+        env DAILY_BRANCH_PREEXEC_HOOK=exit\ 0 \
+            OSSTEST_USE_HEAD=y \
+            BRANCHES_ALWAYS="$branch" \
+            OSSTEST_FLIGHT=$flight \
+            OSSTEST_CONFIG=$config \
+            OSSTEST_NO_BASELINE=y \
+                ./cr-daily-branch $@ $branch
+        ;;
+
+    set-paths)
+	need_flight
+
+	if [ $# -lt 1 ] ; then
+	    echo "set-paths: Need job" >&2
+	    exit 1
+	fi
+
+#build-amd64                       path_dist                    build/dist.tar.gz                                               
+#build-amd64                       path_kerndist                build/kerndist.tar.gz                                           
+#build-amd64-pvops                 path_kerndist                build/kerndist.tar.gz                                           
+#build-amd64                       path_xendist                 build/xendist.tar.gz
+
+	job=$1; shift
+
+	for d in '' xen kern ; do
+	    runvar="path_${d}dist"
+ 	    path="build/${d}dist.tar.gz"
+	    if [ -f "logs/$flight/$job/$path" ] ; then
+		./cs-adjust-flight -v $flight runvar-set $job $runvar $path
+	    fi
+	done
+
+	if [ -f "logs/$flight/$job/build/kerndist.tar.gz" ] ; then
+	    KERNEL_VER=$(tar tzf logs/$flight/$job/build/kerndist.tar.gz |\
+		sed -n -e 's,^lib/modules/\(.*\)/modules.dep$,\1,p')
+	    if [ -n "$KERNEL_VER" ]; then
+		./cs-adjust-flight -v $flight \
+		    runvar-set $job kernel_ver $KERNEL_VER
+	    fi
+	fi
+	;;
+
+    run-job)
+	need_flight; need_host
+
+	if [ $# -lt 1 ] ; then
+	    echo "run-job: Need job" >&2
+	    exit 1
+	fi
+
+	job=$1; shift
+
+	ensure_logs
+
+        env OSSTEST_CONFIG=$config \
+	    OSSTEST_FLIGHT=$flight \
+	    OSSTEST_HOST_HOST=$host \
+	    OSSTEST_HOST_REUSE=$reuse \
+		./sg-run-job $job 2>&1 | tee logs/$flight/$job.log
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ] ; then
+	    echo "FAILED rc=${rc}" >&2
+	fi
+	;;
+    run-test)
+	need_flight; need_host
+
+	if [ $# -lt 2 ] ; then
+	    echo "run-test: Need job + test" >&2
+	    exit 1
+	fi
+
+	job=$1; shift
+	ts=$1; shift
+
+	ensure_logs
+
+	env OSSTEST_CONFIG=$config \
+	    OSSTEST_FLIGHT=$flight \
+	    OSSTEST_CONFIG=$config \
+	    OSSTEST_HOST_REUSE=$reuse \
+	    OSSTEST_JOB=$job \
+		./$ts host=$host $@ 2>&1 | tee logs/$flight/$job.$ts.log
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ] ; then
+	    echo "FAILED rc=${rc}" >&2
+	fi
+	;;
+    *)
+	echo "Unknown op $op" ; exit 1 ;;
+esac