← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/launchpad/bug-181368-ami into lp:launchpad

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/launchpad/bug-181368-ami into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #181368 cron.daily explodes in non-obvious ways if drescher is under load
  https://bugs.launchpad.net/bugs/181368

For more details, see:
https://code.launchpad.net/~jtv/launchpad/bug-181368-ami/+merge/50910

= Summary =

I need to update the EC2 test AMI in order to deploy a change to launchpad-dependencies, so am adding myself to the users who can do that as per https://dev.launchpad.net/EC2Test/Image

The launchpad-dependencies change is already landed in a separate branch, though as yet nothing should break when using the existing AMI's launchpad-dependencies.  The actual AMI change won't involve a Launchpad branch, so is not visible here.


== Proposed fix ==

Update VALID_AMI_OWNERS as per documented policy.  This doesn't require any further approval as far as the documentation says.


== Pre-implementation notes ==

In collaboration with bigjools.


== Implementation details ==

My AWS user ID actually looked slightly different: it's 12-digit base-10 number, but divided with dashes into 4-digit groups.  I stripped the digits to make mine conform.  If that works, I should update the wiki page to mention it.


== Tests ==

I'm just firing off an arbitrary small EC2 test run just to make sure that I didn't break the ec2 script.


== Demo and Q/A ==

After I've published the new AMI (currently still building), ssh into a running instance of the image and run:

  apt-ftparchive --arch=source

That will print out usage instructions, but also, it returns 0 (success) if the upgrade is successful.  It will return failure on a Lucid system without the change.

Top tip, by the way: I include a non-zero return value from my last shell command in my promptr, in red when colours are enabled.  The magic stanza in my .bashrc is:
{{{
if [ "$color_prompt" = yes ]; then
    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\[\033[01;31m\]${?#0}\[\033[01;35m\]\w\[\033[00m\]\$ '
else
    PS1='${debian_chroot:+($debian_chroot)}\u@\h:${?#0}\w\$ '
fi
}}}


= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/devscripts/ec2test/account.py
-- 
https://code.launchpad.net/~jtv/launchpad/bug-181368-ami/+merge/50910
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/launchpad/bug-181368-ami into lp:launchpad.
=== modified file 'lib/devscripts/ec2test/account.py'
--- lib/devscripts/ec2test/account.py	2011-02-02 16:51:04 +0000
+++ lib/devscripts/ec2test/account.py	2011-02-23 12:34:20 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """A representation of an Amazon Web Services account."""
@@ -33,6 +33,7 @@
     '444667466231': 'allenap',
     '441991801793': 'gmb',
     '005470753809': 'bigjools',
+    '967591634984': 'jtv',
     # ...anyone else want in on the fun?
     }