Merge lp://qastaging/~doanac/uci-engine/bsb-unit-config into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Evan
Approved revision: 645
Merged at revision: 657
Proposed branch: lp://qastaging/~doanac/uci-engine/bsb-unit-config
Merge into: lp://qastaging/uci-engine
Diff against target: 156 lines (+32/-42)
4 files modified
branch-source-builder/bsbuilder/tests/test_upload.py (+20/-16)
branch-source-builder/bsbuilder/tests/test_worker.py (+6/-2)
branch-source-builder/cupstream2distro/settings.py (+5/-24)
branch-source-builder/setup.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/bsb-unit-config
Reviewer Review Type Date Requested Status
Paul Larson Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+225382@code.qastaging.launchpad.net

Commit message

bsbuilder: fix TODO for unit_config

Description of the change

As we move code over to our new layout, ie:

 https://code.launchpad.net/~doanac/uci-engine/lander-code-layout/+merge/225046

our unit_config will be in a different location. We need to get everything using unit_config properly so that the change is easier to make.

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

FAILED: Continuous integration, rev:642
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1004/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:643
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1005/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:642
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1007/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Paul Larson (pwlars) wrote :

Still failing on bsb:
== Testing branch-source-builder ....
running test
running egg_info
writing requirements to branch_source_builder.egg-info/requires.txt
writing branch_source_builder.egg-info/PKG-INFO
writing top-level names to branch_source_builder.egg-info/top_level.txt
writing dependency_links to branch_source_builder.egg-info/dependency_links.txt
reading manifest file 'branch_source_builder.egg-info/SOURCES.txt'
writing manifest file 'branch_source_builder.egg-info/SOURCES.txt'
running build_ext
error: /trunk_dir/ci-utils/ci_utils/../../unit_config: No such file or directory
== Testing FAILED for branch-source-builder ==

I'm guessing the unit_config isn't really there for tarmac?

Revision history for this message
Andy Doan (doanac) wrote :

On 07/07/2014 09:02 AM, Paul Larson wrote:
> I'm guessing the unit_config isn't really there for tarmac?

I have no idea. I'm running this at home and can't make it fail. The
really bad part is that python's unittest isn't giving us a stack trace.
I'll have to poke around some to figure out the cause.

Revision history for this message
Andy Doan (doanac) wrote :

Paul figured out the failure. You need to delete /tmp/launchpad* before running this. This will result in:

======================================================================
ERROR: bsbuilder.tests.test_upload (unittest.loader.ModuleImportFailure)
----------------------------------------------------------------------
ImportError: Failed to import test module: bsbuilder.tests.test_upload
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/loader.py", line 254, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python2.7/unittest/loader.py", line 232, in _get_module_from_name
    __import__(name)
  File "bsbuilder/tests/test_upload.py", line 19, in <module>
    from bsbuilder import upload_package
  File "bsbuilder/upload_package.py", line 27, in <module>
    from cupstream2distro import packagemanager
  File "cupstream2distro/packagemanager.py", line 31, in <module>
    import launchpadmanager
  File "cupstream2distro/launchpadmanager.py", line 28, in <module>
    from .settings import ARCHS_TO_EVENTUALLY_IGNORE, ARCHS_TO_UNCONDITIONALLY_IGNORE, VIRTUALIZED_PPA_ARCH, CRED_FILE_PATH, COMMON_LAUNCHPAD_CACHE_DIR
  File "cupstream2distro/settings.py", line 47, in <module>
    f.write('consumer_key = %s\n' % unit_config.get('oauth_consumer_key'))
  File "/net/reckless/home/doanac/code/uci-engine/bsb-unit-config/ci-utils/ci_utils/unit_config.py", line 36, in get
    _load()
  File "/net/reckless/home/doanac/code/uci-engine/bsb-unit-config/ci-utils/ci_utils/unit_config.py", line 29, in _load
    with open(path) as f:
IOError: [Errno 2] No such file or directory: '/net/reckless/home/doanac/code/uci-engine/bsb-unit-config/ci-utils/ci_utils/../../unit_config'

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:644
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1025/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Test 1025 ran into an out-of-control python setup.py when executing on the branch-source-builder. We had to kill the errant process and retry the job. Python was consuming almost all of the RAM and swap on the system, it was bad.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:644
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1026/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

It happened again.

The test is run inside a chroot consisting of a bare minimum build environment plus the uci-engine dependencies.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

i've got this working now. it was something insane with how we were mocking the __builtin__.open. I've made the test a little more sane

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

It's unfortunate how complicated this has become, but the tests pass again.

review: Approve
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :

The attempt to merge lp:~doanac/uci-engine/bsb-unit-config into lp:uci-engine failed. Below is the output from the failed tests.

INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/tmpoYRRM6
INFO:root:virtualenv created in 293.55s.
INFO:root:Deploying.
ERROR:root:Calling `['juju', 'bootstrap']` failed (with code 1):
ERROR:root:WARNING ignoring environments.yaml: using bootstrap config in file "/home/tarmac/.juju/environments/local.jenv"
ERROR:root:ERROR environment is already bootstrapped
ERROR:root:Bootstrapping failed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches