Merge lp:~heber013/ubuntu-test-cases/addind-options-desktop-tests into lp:ubuntu-test-cases/desktop

[Heber Parrucci]

Adding option to provide machine name.
Poweroff VM after tests have run.

Adding option to provide machine name.
Poweroff VM after tests have run.

Make sure we have utah changes (1) landed before landing it.

(1) https://code.launchpad.net/~heber013/utah/adding-setup-for-autopkgtest/+merge/326954

[Jean-Baptiste Lallement (jibel)]

2 style comments to fix

[Jean-Baptiste Lallement (jibel)]

review: Needs Fixing

[lp:~heber013/ubuntu-test-cases/addind-options-desktop-tests]

55. By Heber Parrucci on 2017-07-17

Make if statements shorter

[Heber Parrucci (heber013)]

Comments have been addressed.

[Jean-Baptiste Lallement (jibel)]

Thanks. Approved.

review: Approve

=== modified file 'scripts/base.sh'
--- scripts/base.sh	2014-04-08 07:40:25 +0000
+++ scripts/base.sh	2017-07-17 14:38:37 +0000
@@ -8,15 +8,21 @@
 options:
     -h               Show this help and exit
     -i IMAGE         Path/URL to image to be used
+    -n NAME          Machine name to provision
 EOF
 }
 
 parse_args()
 {
-    while getopts :i: OPTION; do
+    while getopts :i:n: OPTION; do
         case $OPTION in
             i)
                 IMAGE=$OPTARG
+                shift 2
+                ;;
+            n)
+                NAME=$OPTARG
+                shift 2
                 ;;
             ?)
                 usage
@@ -40,13 +46,11 @@
         exit
     fi
 
-    if [ -z "$BOOT_ARGS" ]; then
-        CMD="run_utah_tests.py -i $IMAGE -p $PRESEED $RUNLIST -f /var/log/installer"
-    else
-        CMD="run_utah_tests.py -i $IMAGE -p $PRESEED -b $BOOT_ARGS $RUNLIST -f /var/log/installer"
-    fi
-
-    if [ -n "$EXTRA_ARGS" ]; then
-        CMD="$CMD $EXTRA_ARGS"
-    fi
+    CMD="run_utah_tests.py -i $IMAGE -p $PRESEED $RUNLIST -f /var/log/installer -n --poweroff"
+
+    [ -n "$NAME" ] && CMD="$CMD --name $NAME"
+
+    [ -n "$BOOT_ARGS" ] && CMD="$CMD -b $BOOT_ARGS"
+
+    [ -n "$EXTRA_ARGS" ] && CMD="$CMD $EXTRA_ARGS"
 }