← Back to team overview

ubuntu-server-ec2-testing-dev team mailing list archive

[Merge] lp:~smoser/ubuntu-server-ec2-testing/fixes into lp:ubuntu-server-ec2-testing

 

The proposal to merge lp:~smoser/ubuntu-server-ec2-testing/fixes into lp:ubuntu-server-ec2-testing has been updated.

Commit Message changed to:

try harder to get terminated logs, actually terminate with boto 2.0

This adds the terminate_and_wait method to TestCaseExecutor. As seen at
[1], TidyUp would raise an exception and prevent the final retrieval of
logs. Without those final logs, there was no way to debug what went
wrong. We make tidyup use this and basically try harder to get logs
of the terminated instance.

In the "all is well" path, there should be no additional wait, as
terminate_and_wait will recognize that the instance is already terminated.
Also, collect-console will recognize that there already exists console
output, so we wont' overwrite it.

This also fixes a bug in the test suite when using boto 2.0. Natty's
version of boto a boto.ec2.instance.stop() would terminate an instance,
but that is obviously wrong. Both 2.0 and natty's version have a
'terminate' method, so we use that.

--
[1] https://jenkins.qa.ubuntu.com/job/oneiric-server-ec2/10/ARCH=i386,REGION=ap-southeast-1,STORAGE=instance-store,TEST=cloud-config,label=ubuntu-server-ec2-testing/console

For more details, see:
https://code.launchpad.net/~smoser/ubuntu-server-ec2-testing/fixes/+merge/79174
-- 
https://code.launchpad.net/~smoser/ubuntu-server-ec2-testing/fixes/+merge/79174
Your team Ubuntu Server ec2 Testing Developers is requested to review the proposed merge of lp:~smoser/ubuntu-server-ec2-testing/fixes into lp:ubuntu-server-ec2-testing.


References