Merge lp:~salgado/launchpad/ec-log-in-as-ubuntu into lp:launchpad/db-devel

[Guilherme Salgado]

This branch changes our ec2 utilities so that we can use them to build a
Launchpad-ready AMI using the official Ubuntu AMIs. This will make it
trivial for us to generate a Lucid AMI when the time comes.

The branch is originally from Michael Hudson, but I was asked to build
an AMI (based on the official images) to be used by ect-test, so I'll
have to land his changes to make the new AMI usable.

--
Guilherme Salgado <email address hidden>

[Jonathan Lange (jml)]

This looks fine to me. Please land.

review: Approve

=== modified file 'lib/devscripts/ec2test/instance.py'
--- lib/devscripts/ec2test/instance.py	2010-03-21 15:19:26 +0000
+++ lib/devscripts/ec2test/instance.py	2010-04-01 14:21:08 +0000
@@ -128,7 +128,7 @@
 aptitude update
 aptitude -y full-upgrade
 
-apt-get -y install launchpad-developer-dependencies apache2 apache2-mpm-worker
+DEBIAN_FRONTEND=noninteractive apt-get -y install launchpad-developer-dependencies apache2 apache2-mpm-worker
 
 # Create the ec2test user, give them passwordless sudo.
 adduser --gecos "" --disabled-password ec2test
@@ -357,16 +357,17 @@
         """
         if not self._ec2test_user_has_keys:
             if connection is None:
-                connection = self._connect('root')
+                connection = self._connect('ubuntu')
                 our_connection = True
             else:
                 our_connection = False
             self._upload_local_key(connection, 'local_key')
             connection.perform(
-                'cat /root/.ssh/authorized_keys local_key '
-                '> /home/ec2test/.ssh/authorized_keys && rm local_key')
-            connection.perform('chown -R ec2test:ec2test /home/ec2test/')
-            connection.perform('chmod 644 /home/ec2test/.ssh/*')
+                'cat /home/ubuntu/.ssh/authorized_keys local_key '
+                '| sudo tee /home/ec2test/.ssh/authorized_keys > /dev/null'
+                '&& rm local_key')
+            connection.perform('sudo chown -R ec2test:ec2test /home/ec2test/')
+            connection.perform('sudo chmod 644 /home/ec2test/.ssh/*')
             if our_connection:
                 connection.close()
             self.log(
@@ -382,13 +383,13 @@
         lot of set up.
         """
         if self._from_scratch:
-            root_connection = self._connect('root')
-            self._upload_local_key(root_connection, 'local_key')
-            root_connection.perform(
+            ubuntu_connection = self._connect('ubuntu')
+            self._upload_local_key(ubuntu_connection, 'local_key')
+            ubuntu_connection.perform(
                 'cat local_key >> ~/.ssh/authorized_keys && rm local_key')
-            root_connection.run_script(from_scratch_root)
-            self._ensure_ec2test_user_has_keys(root_connection)
-            root_connection.close()
+            ubuntu_connection.run_script(from_scratch_root, sudo=True)
+            self._ensure_ec2test_user_has_keys(ubuntu_connection)
+            ubuntu_connection.close()
             conn = self._connect('ec2test')
             conn.run_script(
                 from_scratch_ec2test
@@ -644,12 +645,15 @@
             raise RuntimeError('Command failed: %s' % (cmd,))
         return res
 
-    def run_script(self, script_text):
+    def run_script(self, script_text, sudo=False):
         """Upload `script_text` to the instance and run it with bash."""
         script = self.sftp.open('script.sh', 'w')
         script.write(script_text)
         script.close()
-        self.run_with_ssh_agent('/bin/bash script.sh')
+        cmd = '/bin/bash script.sh'
+        if sudo:
+            cmd = 'sudo ' + cmd
+        self.run_with_ssh_agent(cmd)
         # At least for mwhudson, the paramiko connection often drops while the
         # script is running.  Reconnect just in case.
         self.reconnect()
 
=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2010-03-18 21:48:57 +0000
+++ lib/devscripts/ec2test/testrunner.py	2010-04-01 14:21:08 +0000
@@ -321,7 +321,7 @@
         as_user = user_connection.perform
         # Set up bazaar.conf with smtp information if necessary
         if self.email or self.message:
-            as_user('mkdir .bazaar')
+            as_user('[ -d .bazaar ] || mkdir .bazaar')
             bazaar_conf_file = user_connection.sftp.open(
                 ".bazaar/bazaar.conf", 'w')
             bazaar_conf_file.write(