Merge lp://staging/~mbp/launchpad/800295-delete-buildd into lp://staging/launchpad
Proposed by
Martin Pool
| Status: | Merged |
|---|---|
| Approved by: | Martin Pool |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 14311 |
| Proposed branch: | lp://staging/~mbp/launchpad/800295-delete-buildd |
| Merge into: | lp://staging/launchpad |
| Diff against target: |
9037 lines (+19/-8598) 63 files modified
.bzrignore (+0/-8) buildout.cfg (+4/-2) lib/canonical/buildd/Makefile (+0/-19) lib/canonical/buildd/README (+0/-47) lib/canonical/buildd/__init__.py (+0/-5) lib/canonical/buildd/binarypackage.py (+0/-133) lib/canonical/buildd/buildd-config.py (+0/-54) lib/canonical/buildd/buildd-slave-example.conf (+0/-25) lib/canonical/buildd/buildd-slave.tac (+0/-55) lib/canonical/buildd/buildrecipe (+0/-220) lib/canonical/buildd/check-implicit-pointer-functions (+0/-118) lib/canonical/buildd/debian.py (+0/-239) lib/canonical/buildd/debian/changelog (+0/-698) lib/canonical/buildd/debian/compat (+0/-1) lib/canonical/buildd/debian/control (+0/-17) lib/canonical/buildd/debian/launchpad-buildd.cron.daily (+0/-10) lib/canonical/buildd/debian/launchpad-buildd.examples (+0/-1) lib/canonical/buildd/debian/launchpad-buildd.init (+0/-98) lib/canonical/buildd/debian/postinst (+0/-101) lib/canonical/buildd/debian/rules (+0/-96) lib/canonical/buildd/debian/source/format (+0/-1) lib/canonical/buildd/debian/upgrade-config (+0/-122) lib/canonical/buildd/generate-translation-templates (+0/-66) lib/canonical/buildd/mount-chroot (+0/-25) lib/canonical/buildd/override-sources-list (+0/-31) lib/canonical/buildd/pottery/generate_translation_templates.py (+0/-114) lib/canonical/buildd/pottery/intltool.py (+0/-342) lib/canonical/buildd/remove-build (+0/-25) lib/canonical/buildd/sbuild (+0/-3658) lib/canonical/buildd/sbuild-package (+0/-92) lib/canonical/buildd/sbuild.conf (+0/-155) lib/canonical/buildd/sbuildrc (+0/-32) lib/canonical/buildd/scan-for-processes (+0/-43) lib/canonical/buildd/slave.py (+0/-686) lib/canonical/buildd/sourcepackagerecipe.py (+0/-144) lib/canonical/buildd/template-buildd-slave.conf (+0/-32) lib/canonical/buildd/test_buildd_generatetranslationtemplates (+0/-33) lib/canonical/buildd/test_buildd_recipe (+0/-48) lib/canonical/buildd/tests/__init__.py (+0/-4) lib/canonical/buildd/tests/buildd-slave-test.conf (+0/-27) lib/canonical/buildd/tests/buildlog (+0/-23) lib/canonical/buildd/tests/buildlog.long (+0/-82) lib/canonical/buildd/tests/harness.py (+0/-139) lib/canonical/buildd/tests/test_1.diff (+0/-17) lib/canonical/buildd/tests/test_2.diff (+0/-32) lib/canonical/buildd/tests/test_buildd_slave.py (+0/-198) lib/canonical/buildd/tests/test_check_implicit_pointer_functions.py (+0/-43) lib/canonical/buildd/tests/test_harness.py (+0/-10) lib/canonical/buildd/tests/test_translationtemplatesbuildmanager.py (+0/-173) lib/canonical/buildd/translationtemplates.py (+0/-99) lib/canonical/buildd/umount-chroot (+0/-40) lib/canonical/buildd/unpack-chroot (+0/-52) lib/canonical/buildd/update-debian-chroot (+0/-45) lib/canonical/launchpad/daemons/readyservice.py (+0/-6) lib/lp/buildmaster/model/builder.py (+3/-3) lib/lp/buildmaster/tests/mock_slaves.py (+1/-1) lib/lp/buildmaster/tests/test_builder.py (+2/-1) lib/lp/buildmaster/tests/test_manager.py (+2/-1) lib/lp/testing/factory.py (+0/-1) lib/lp/translations/tests/test_generate_translation_templates.py (+5/-2) lib/lp/translations/tests/test_pottery_detect_intltool.py (+1/-1) scripts/rosetta/pottery-generate-intltool.py (+1/-1) utilities/snakefood/lp-sfood-packages (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~mbp/launchpad/800295-delete-buildd |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Launchpad code reviewers | Pending | ||
|
Review via email:
|
|||
Commit message
[r=mbp][bug=800295] delete lib/canonical/
Description of the change
Further to bug 800295, this
* deletes the lib/canonical/
* changes tests that need the buildd packages to load them from the 'lpbuildd' package instead
* inserts onto the pythonpath the /usr/share/
This cannot be landed until the lpbuildd package is added as a deb dependency of Launchpad, which requires some more work to separate 'acts as a buildd' from 'provides the lpbuildd python package', and preferably also a deployment of the new launchpad-buildd package to prove it works ok.
Eventually we might want to remove the test-time dependencies altogether in favour of testing against a fake <https:/
To post a comment you must log in.
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Revision history for this message
| Martin Pool (mbp) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
after discussion with elmo and others, i'm going to split the binaries to a separate package and make it disabled by default