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

Proposed by Michael Nelson
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 9405
Proposed branch: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-7
Merge into: lp://staging/launchpad/db-devel
Prerequisite: lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-6
Diff against target: 875 lines (+141/-100) (has conflicts)
33 files modified
lib/canonical/launchpad/webapp/configure.zcml (+1/-1)
lib/canonical/launchpad/webapp/tales.py (+4/-4)
lib/lp/buildmaster/model/builder.py (+9/-3)
lib/lp/registry/browser/person.py (+4/-4)
lib/lp/registry/browser/sourcepackage.py (+1/-1)
lib/lp/registry/model/distribution.py (+2/-2)
lib/lp/registry/templates/person-macros.pt (+1/-1)
lib/lp/soyuz/browser/binarypackagerelease.py (+1/-1)
lib/lp/soyuz/browser/build.py (+3/-3)
lib/lp/soyuz/browser/configure.zcml (+1/-1)
lib/lp/soyuz/browser/distributionsourcepackagerelease.py (+2/-2)
lib/lp/soyuz/browser/publishing.py (+1/-1)
lib/lp/soyuz/model/archive.py (+4/-3)
lib/lp/soyuz/model/distributionsourcepackagerelease.py (+3/-3)
lib/lp/soyuz/model/files.py (+4/-4)
lib/lp/soyuz/model/publishing.py (+1/-1)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-ppa-files.txt (+4/-4)
lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-build-record.txt (+17/-9)
lib/lp/soyuz/stories/soyuz/xx-private-builds.txt (+7/-6)
lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-builds.txt (+27/-3)
lib/lp/soyuz/stories/webservice/xx-hasbuildrecords.txt (+6/-5)
lib/lp/soyuz/templates/build-index.pt (+18/-18)
lib/lp/soyuz/templates/build-retry.pt (+1/-1)
lib/lp/soyuz/templates/builds-list.pt (+8/-8)
lib/lp/soyuz/templates/distributionsourcepackagerelease-index.pt (+1/-1)
lib/lp/soyuz/templates/packagepublishing-details.pt (+1/-1)
lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt (+1/-1)
lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-extra.pt (+1/-1)
lib/lp/soyuz/templates/sourcepackagerelease-portlet-builds.pt (+3/-3)
Text conflict in lib/canonical/launchpad/security.py
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
Text conflict in lib/lp/code/model/tests/test_sourcepackagerecipebuild.py
Text conflict in lib/lp/soyuz/model/binarypackagebuildbehavior.py
To merge this branch: bzr merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-7
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+25494@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**: The MP correctly mentions conflicts with db-devel but these shouldn't be in the displayed diff (against the previous branch, and if not here it is:http://pastebin.ubuntu.com/435402/). The conflicts are 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.

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 remaining soyuz doctests passing. It's mostly mechanical, other one nice demonstration of the 1.0 api versus beta API for BinaryPackageBuild.

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 stories/soyuz

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve

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: