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

Proposed by Michael Nelson
Status: Merged
Approved by: Eleanor Berger
Approved revision: no longer in the source branch.
Merged at revision: 9405
Proposed branch: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-6
Merge into: lp://staging/launchpad/db-devel
Prerequisite: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-5
Diff against target: 787 lines (+135/-104) (has conflicts)
22 files modified
lib/lp/buildmaster/model/buildfarmjob.py (+6/-1)
lib/lp/soyuz/doc/buildd-dispatching.txt (+15/-11)
lib/lp/soyuz/doc/distroarchseries.txt (+1/-1)
lib/lp/soyuz/doc/distroseriesqueue-translations.txt (+2/-2)
lib/lp/soyuz/doc/distroseriesqueue.txt (+1/-1)
lib/lp/soyuz/doc/gina-multiple-arch.txt (+3/-3)
lib/lp/soyuz/doc/gina.txt (+8/-8)
lib/lp/soyuz/doc/initialise-from-parent.txt (+2/-2)
lib/lp/soyuz/doc/package-meta-classes.txt (+1/-1)
lib/lp/soyuz/doc/sourcepackagerelease.txt (+7/-2)
lib/lp/soyuz/model/binarypackagebuild.py (+0/-2)
lib/lp/soyuz/model/binarypackagebuildbehavior.py (+18/-18)
lib/lp/soyuz/model/buildfarmbuildjob.py (+4/-3)
lib/lp/soyuz/model/buildpackagejob.py (+23/-12)
lib/lp/soyuz/model/distributionsourcepackagerelease.py (+4/-5)
lib/lp/soyuz/model/distroarchseriesbinarypackagerelease.py (+1/-1)
lib/lp/soyuz/model/distroseriesbinarypackage.py (+1/-1)
lib/lp/soyuz/model/distroseriessourcepackagerelease.py (+8/-7)
lib/lp/soyuz/model/queue.py (+4/-4)
lib/lp/soyuz/scripts/gina/handlers.py (+16/-17)
lib/lp/soyuz/scripts/queue.py (+2/-2)
lib/lp/soyuz/tests/test_buildpackagejob.py (+8/-0)
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-6
Reviewer Review Type Date Requested Status
Eleanor Berger (community) code Approve
Review via email: mp+25298@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 the rest of the (non-story) soyuz doctests passing. It's mostly mechanical, other than a few queries requiring more joins.

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 distroarchseries.txt -t distroseriesbinarypackage.txt -t distroseriesqueue-translations.txt -t distroseriesqueue.txt -t ftpmaster-tools.txt -t gina-multiple-arch.txt -t gina.txt -t initialise-from-parent.txt -t package-meta-classes.txt -t sourcepackagerelease.txt

The next branch will start on the soyuz story doctests.

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: