Merge lp:~pwlars/ubuntu-ci-services-itself/check-testbed into lp:ubuntu-ci-services-itself

Proposed by Paul Larson
Status: Merged
Approved by: Chris Johnston
Approved revision: 292
Merged at revision: 300
Proposed branch: lp:~pwlars/ubuntu-ci-services-itself/check-testbed
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 21 lines (+3/-1)
1 file modified
test_runner/run_worker (+3/-1)
To merge this branch: bzr merge lp:~pwlars/ubuntu-ci-services-itself/check-testbed
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208873@code.launchpad.net

Commit message

Make sure test_bed exists before tearing it down to avoid extraneous errors if we hit other problems

Description of the change

Small fix for the testrunner. I was seeing a failure due to keystoneclient being missing. Installing keystoneclient, I can now get through a full test run. That part of it looks like it will be taken care of ev's recent changes to put things in our ppa, as testrunner installs packages that properly depend on keystoneclient now. This wasn't obvious at first though because test_bed didn't get to the point of getting created so couldn't see the earlier error.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:292
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/254/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/254/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

+1 from me, clearly the try/finally block is too big.

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

> Installing keystoneclient, I can now get through a full test run.

Can you elaborate on that ? Is it as a full end-to-end test or some other more direct manual test ?

> This wasn't obvious at first though because test_bed didn't get to the point of getting created so couldn't see the earlier error.

Definitely worth fixing asap, it's on my radar.

review: Needs Information
Revision history for this message
Paul Larson (pwlars) wrote :

It was a full end-to-end test run. I created a ticket with the cli, and watched it build the package, build the image, run the tests, etc

Revision history for this message
Vincent Ladeuil (vila) wrote :

I hereby DO approve this MP !

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (154.9 KiB)

The attempt to merge lp:~pwlars/ubuntu-ci-services-itself/check-testbed into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.XJFeI8tBGq/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Unpacking /tmp/tarmac/branch.MnwhH1/.deps/Babel-1.3.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.MnwhH1/.deps/Babel-1.3.tar.gz

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Installing collected packages: Babel
  Running setup.py install for Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
    Installing pybabel script to /tmp/tmp.XJFeI8tBGq/bin
Successfully installed Babel
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.MnwhH1/.deps/pbr-0.6.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.MnwhH1/.deps/pbr-0.6.tar.gz
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Installing collected packages: pbr
  Running setup.py install for pbr
    [pbr] Reusing existing SOURCES.txt
Successfully installed pbr
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.MnwhH1/.deps/iso8601-0.1.8.tar.gz
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.MnwhH1/.deps/iso8601-0.1.8.tar.gz

Installing collected packages: iso8601
  Running setup.py install for iso8601

Successfully installed iso8601
Cleaning up...
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/deps/
No revisions or tags to pull.
Unpacking /tmp/tarmac/branch.MnwhH1/.deps/prettytable-0.7.2.zip
  Running setup.py egg_info for package from file:///tmp/tarmac/branch.MnwhH1/.deps/prettytable-0.7.2.zip

Installing collected packages: prettyta...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test_runner/run_worker'
2--- test_runner/run_worker 2014-02-24 19:42:48 +0000
3+++ test_runner/run_worker 2014-02-28 19:52:07 +0000
4@@ -49,6 +49,7 @@
5 notify = amqp_utils.progress_completed
6 results = {}
7 try:
8+ test_bed = None
9 store = data_store.create_for_ticket(ticket, tstrun.get_auth_config())
10 # FIXME: We need either a config option or a parameter for the instance
11 # flavor -- vila 2014-01-29
12@@ -88,7 +89,8 @@
13 # an exception occurs while calling 'notify' just above, tricky testing
14 # ahead... -- vila 2014-02-06
15 msg.channel.basic_ack(msg.delivery_tag)
16- test_bed.teardown()
17+ if test_bed:
18+ test_bed.teardown()
19
20
21 if __name__ == '__main__':

Subscribers

People subscribed via source and target branches