lxc build to use lxc branch of bootcd

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 3580c7e..d147747 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -416,6 +416,7 @@ function usage () {
     echo "    the -f/-d/-p/-m/-s/-t options are uneffective in this case"
     echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
     echo " -y {pl,pg} - passed to run_log"
+    echo " -x <run_log_args> - a hook to pass arguments to run_log"
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
     echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL; this is also used to get the hostname where to publish builds"
     echo " -r webroot - defaults to $DEFAULT_WEBROOT - the fs point where testbuildurl actually sits"
@@ -450,7 +451,7 @@ function main () {
     SIGNYUMREPO=""
 
     OPTS_ORIG=$@
-    OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:y:w:W:r:M:Yg:u:K:SBTnv7i:h" -l "build-branch:" -- $@)
+    OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:y:e:Xx:w:W:r:M:Yg:u:K:SBTnv7i:h" -l "build-branch:" -- $@)
     if [ $? != 0 ]
     then
         usage
@@ -467,7 +468,17 @@ function main () {
            -b) BASE=$2; shift 2 ;;
            -o) OVERBASE=$2; shift 2 ;;
            -c) TESTCONFIG="$TESTCONFIG $2"; shift 2 ;;
-           -y) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS -y $2"; shift 2 ;;
+           ########## passing stuff to run_log
+           # -y foo -> run_log -y foo
+           -y) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --rspec-style $2"; shift 2 ;;
+           # -e foo -> run_log -e foo
+           -e) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --exclude $2"; shift 2 ;;
+           # -X -> run_log -X
+           -X) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --lxc"; shift;;
+           # more general form to pass args to run_log
+           # -x foo -> run_log foo
+           -x) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS $2"; shift 2;;
+           ##########
            -w) WEBPATH=$2; shift 2 ;;
            -W) TESTBUILDURL=$2; shift 2 ;;
            -r) WEBROOT=$2; shift 2 ;;