[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 12/27] standalone-reset: introduce a new -t option
for making it possible to call the new make-bench-flight script, and generating the benchmarking jobs. It can be combined with the existing '-f' option, to create a benchmarking flight containing all the benchmarking jobs. This is generic, so, when passing '-t sometype', a script called make-sometype-flight is what will be invoked. Signed-off-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx> Cc: Wei Liu <wei.liu2@xxxxxxxxxx> Cc: Ian Campbell <Ian.Campbell@xxxxxxxxxx> Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> --- Changes from RFCv1: * this into "standalone make-flight" too, as requested during review. --- cr-daily-branch | 3 ++- standalone | 7 +++++-- standalone-reset | 9 ++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cr-daily-branch b/cr-daily-branch index 17bb2c9..521682a 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -22,6 +22,7 @@ set -ex . cri-args-hostlists . ap-common branch=$1; shift +ftype=$1; shift select_branch info_linux_tree $branch ||: @@ -231,7 +232,7 @@ if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then fi $DAILY_BRANCH_PREMAKE_HOOK -flight=`./make-flight $branch $xenbranch $OSSTEST_BLESSING "$@"` +flight=`./make-$ftype-flight $branch $xenbranch $OSSTEST_BLESSING "$@"` $DAILY_BRANCH_POSTMAKE_HOOK heading=tmp/$flight.heading-info diff --git a/standalone b/standalone index caf3fd5..22540c1 100755 --- a/standalone +++ b/standalone @@ -39,6 +39,7 @@ Options: -c FILE, --config=FILE Use FILE as configuration file -f FLIGHT, --flight=FLIGHT Operate on FLIGHT +-t FL_TYPE, --type=FL_TYPE Flight type (for invoking make-<FL_TYPE>-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) @@ -63,12 +64,13 @@ if [ x$op = x--help ] ; then exit 0 fi -TEMP=$(getopt -o c:f:h:rR --long config:,flight:,host:,reuse,noreuse,reinstall,lvextendmax:,baseline,help -- "$@") +TEMP=$(getopt -o c:f:t:h:rR --long config:,flight:,ftype:,host:,reuse,noreuse,reinstall,lvextendmax:,baseline,help -- "$@") eval set -- "$TEMP" config=${OSSTEST_CONFIG-$HOME/.xen-osstest/config} flight="standalone" +ftype= host= reuse=1 # Don't blow away machines by default lvextendmax=50 # Leave some LVM space free for running tests @@ -78,6 +80,7 @@ while true ; do case "$1" in -c|--config) config=$2; shift 2;; -f|--flight) flight=$2; shift 2;; + -t|--type) ftype=$2; shift 2;; -h|--host) host=$2; shift 2;; -r|--reuse) reuse=1; shift 1;; -R|--noreuse|--reinstall)reuse=0;shift 1;; @@ -184,7 +187,7 @@ case $op in OSSTEST_FLIGHT=$flight \ OSSTEST_CONFIG=$config \ OSSTEST_NO_BASELINE=$nobaseline \ - with_logging logs/$flight/make-flight.log ./cr-daily-branch $@ $branch + with_logging logs/$flight/make-flight.log ./cr-daily-branch $@ $branch $ftype ;; set-paths) diff --git a/standalone-reset b/standalone-reset index 8555039..f041e6d 100755 --- a/standalone-reset +++ b/standalone-reset @@ -23,14 +23,17 @@ usage(){ usage: ./standalone-reset [<options>] [<branch> [<xenbranch> [<buildflight>]]] branch and xenbranch default, separately, to xen-unstable options: - -f<flight> generate flight "flight", default is "standalone" + -f <flight> generate flight "flight", default is "standalone" + -t <flight_type> generate a different type of flight (it calls + make-<flight_type>-flight) END } flight="standalone" -while getopts "f:" opt; do +while getopts "f:t:" opt; do case "$opt" in f) flight=${OPTARG};; + t) flight_type="-${OPTARG}";; *) usage; exit 1;; esac done @@ -140,7 +143,7 @@ fi export BUILD_LVEXTEND_MAX OSSTEST_FLIGHT=$flight \ -./make-flight "$branch" "$xenbranch" play $buildflight >/dev/null +./make${flight_type}-flight "$branch" "$xenbranch" play $buildflight >/dev/null #---------- done ---------- _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |