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

Proposed by Max Brustkern
Status: Merged
Approved by: Javier Collado
Approved revision: 34
Merged at revision: 33
Proposed branch: lp:~nuclearbob/ubuntu-test-cases/1087679
Merge into: lp:~javier.collado/ubuntu-test-cases/desktop
Diff against target: 31 lines (+8/-1)
3 files modified
configs/oem.conf (+4/-0)
preseeds/oem.cfg (+3/-0)
scripts/oem.sh (+1/-1)
To merge this branch: bzr merge lp:~nuclearbob/ubuntu-test-cases/1087679
Reviewer Review Type Date Requested Status
Javier Collado Approve
Review via email: mp+138832@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

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.

Revision history for this message
Javier Collado (javier.collado) wrote :

Worked fine for me this time. Thanks a lot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1{
2 "sshprivatekey": "~/.ssh/utah",
3 "user": "oem"
4}
05
=== 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 @@
35d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core35d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
36#need this for non-desktop36#need this for non-desktop
37d-i finish-install/reboot_in_progress note37d-i finish-install/reboot_in_progress note
38# These are specific to this test case
39d-i oem-config/enable boolean true
40d-i oem-config/id string USIT_OEM
38d-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" ]41d-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" ]
3942
=== 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 @@
88
9. $SCRIPT_DIR/base.sh9. $SCRIPT_DIR/base.sh
10parse_args "$@"10parse_args "$@"
11echo $CMD11echo "UTAH_CONFIG_FILE=$BRANCH_DIR/configs/oem.conf $CMD"

Subscribers

People subscribed via source and target branches

to all changes: