Merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-5 into lp://staging/launchpad/db-devel

Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: no longer in the source branch.
Merged at revision: 9405
Proposed branch: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-5
Merge into: lp://staging/launchpad/db-devel
Prerequisite: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-4
Diff against target: 970 lines (+248/-179) (has conflicts)
10 files modified
lib/canonical/launchpad/security.py (+45/-27)
lib/lp/buildmaster/configure.zcml (+19/-12)
lib/lp/buildmaster/model/buildfarmjob.py (+5/-3)
lib/lp/buildmaster/model/packagebuild.py (+8/-2)
lib/lp/buildmaster/tests/test_buildfarmjob.py (+38/-6)
lib/lp/buildmaster/tests/test_packagebuild.py (+43/-1)
lib/lp/soyuz/doc/binarypackagebuild.txt (+50/-104)
lib/lp/soyuz/doc/buildd-mass-retry.txt (+1/-1)
lib/lp/soyuz/model/binarypackagebuild.py (+38/-22)
lib/lp/soyuz/stories/webservice/xx-builds.txt (+1/-1)
Text conflict in lib/lp/buildmaster/interfaces/buildbase.py
Text conflict in lib/lp/buildmaster/model/buildbase.py
Text conflict in lib/lp/buildmaster/tests/test_buildbase.py
Text conflict in lib/lp/code/model/sourcepackagerecipebuild.py
To merge this branch: bzr merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-5
Reviewer Review Type Date Requested Status
Eleanor Berger (community) code Approve
Review via email: mp+25239@code.staging.launchpad.net

Description of the change

This branch is part of a pipeline for

https://blueprints.edge.launchpad.net/soyuz/+spec/build-generalisation
https://dev.launchpad.net/LEP/GeneralBuildHistories

**Note**: If it's possible, please ignore the conflicts with db-devel - it's due to a reversion of some work that was in db-devel and that I'd already pumped through the pipeline, and I'm waiting for that work to land again on db-devel before re-merging and pumping.

The actual diff of this branch from the previous is:
http://pastebin.ubuntu.com/432830/

Overview
========
This branch continues the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/BuildFarmJob).

This branch gets just renames build.txt => binarypackagebuild.txt and updates the test and code to pass.

Note: Some parts of the doctest were removed in favour of new unit tests.

This branch is dependent on the pending schema patch in a previous branch.

To test
=======

First update the test db schema (required as the db patch still needs to be updated to remove the old build table):
psql launchpad_ftest_template -f database/schema/pending/michaeln-build-generalisation.sql
bin/py database/schema/security.py -d launchpad_ftest_template

And then:
bin/test -vv -t test_buildfarmjob -t test_packagebuild -t doc/binarypackagebuild.txt

The next branch will continue getting the remaining soyuz doctests passing with the new model.

To post a comment you must log in.
Revision history for this message
Eleanor Berger (intellectronica) :
review: Approve (code)

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

to status/vote changes: