Merge lp:~nuclearbob/ubuntu-test-cases/1087679 into lp:~javier.collado/ubuntu-test-cases/desktop

[Max Brustkern]

This branch updates the oem preseed to add the oem config options and introduces a config file. The config file specifies oem as the user to install on the system and specifies that the current user's ssh key should still be used. The script to generate the job command line is updated to add the appropriate config file as UTAH_CONFIG_FILE. This requires a couple of utah merges to work correctly:
https://code.launchpad.net/~nuclearbob/utah/bug1087679/+merge/138811
https://code.launchpad.net/~nuclearbob/utah/url-config/+merge/138825

I can make those into one branch if that would be easier for testing. I tested the changes separately before testing them together, which is how they ended up as two branches.

[Javier Collado (javier.collado)]

When trying to test the changes I got this exception when trying to connect
through SSH:

IOError: [Errno 2] No such file or directory: u'~/.ssh/utah'

I tested locally with dev branch after merging the the branches above, but
something might have gone wrong. I'll review the configuration file and see if
there's some `os.path.expanduser` missing.

[Javier Collado (javier.collado)]

Worked fine for me this time. Thanks a lot!

review: Approve

=== added directory 'configs'
=== added file 'configs/oem.conf'
--- configs/oem.conf	1970-01-01 00:00:00 +0000
+++ configs/oem.conf	2012-12-07 21:52:22 +0000
@@ -0,0 +1,4 @@
+{
+    "sshprivatekey": "~/.ssh/utah", 
+    "user": "oem" 
+}

=== modified file 'preseeds/oem.cfg'
--- preseeds/oem.cfg	2012-09-14 14:25:01 +0000
+++ preseeds/oem.cfg	2012-12-07 21:52:22 +0000
@@ -35,4 +35,7 @@
 d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
 #need this for non-desktop
 d-i finish-install/reboot_in_progress note
+# These are specific to this test case
+d-i oem-config/enable boolean true
+d-i oem-config/id string USIT_OEM
 d-i preseed/late_command string  chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]

=== modified file 'scripts/oem.sh'
--- scripts/oem.sh	2012-11-27 17:05:48 +0000
+++ scripts/oem.sh	2012-12-07 21:52:22 +0000
@@ -8,4 +8,4 @@
 
 . $SCRIPT_DIR/base.sh
 parse_args "$@"
-echo $CMD
+echo "UTAH_CONFIG_FILE=$BRANCH_DIR/configs/oem.conf $CMD"