Merge lp:~danilo/launchpad/bug-817398 into lp:launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Данило Шеган | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 14171 | ||||
Proposed branch: | lp:~danilo/launchpad/bug-817398 | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
349 lines (+99/-19) 10 files modified
configs/development/launchpad-lazr.conf (+1/-0) lib/canonical/buildd/debian/changelog (+6/-0) lib/canonical/buildd/generate-translation-templates (+3/-2) lib/lp/poppy/tests/test_poppy.py (+3/-3) lib/lp/translations/configure.zcml (+7/-1) lib/lp/translations/model/translationtemplatesbuild.py (+12/-2) lib/lp/translations/model/translationtemplatesbuildbehavior.py (+50/-9) lib/lp/translations/stories/buildfarm/xx-build-summary.txt (+1/-1) lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py (+13/-0) utilities/make-lp-user (+3/-1) |
||||
To merge this branch: | bzr merge lp:~danilo/launchpad/bug-817398 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+79571@code.launchpad.net |
Commit message
[r=jtv][bug=817398] Pass the path pottery is installed into as PYTHONPATH when running generate_
Description of the change
= Bug 817398: template generation (WIP) =
Template generation has stopped working when buildd default image has switched to Ubuntu Natty (as the development version). That included Python 2.7 by default and generate-
This is easy to fix, but this has been broken for quite some time (maybe a full year even) because there is no proper logging for TranslationTemp
== Implementation details ==
1. configs/
2. utilities/
3. generate-
4. configure.zcml copies a similar declaration that SourcePackageRe
5. translationtemp
6. translationtemp
I've only did the minimal test changes. I don't think I can spend more time on this branch, but I did spend a lot of time trying stuff out locally. Ideally, most of this code would be refactored to use the "generic" infrastructure provided by things like PackageBuildDer
== Tests ==
bin/test -vvt translationtemp
== Demo and Q/A ==
* Set up translation import for a project (translations.
* Push a branch which should generate translation template (eg. lp:eog) to staging, link it to the trunk series (what was set-up above)
* Run cronscripts/
* Wait for build-manager to pick it up and build it (you may need to ask for it to be run on staging as "bin/twistd --logile ... --pidfile ... -y daemons/
* When the job finishes, it should keep the log in the builder history available from the builder page on launchpad.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
configs/
lib/canonical
lib/canonical
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
utilities/
./configs/
92: Line exceeds 78 characters.
111: Line exceeds 78 characters.
125: Line exceeds 78 characters.
./lib/canonical
59: Line exceeds 78 characters.
./lib/canonical
232: Line exceeds 78 characters.
298: Line exceeds 78 characters.
488: Line exceeds 78 characters.
495: Line exceeds 78 characters.
516: Line exceeds 78 characters.
522: Line exceeds 78 characters.
528: Line exceeds 78 characters.
534: Line exceeds 78 characters.
541: Line exceeds 78 characters.
549: Line exceeds 78 characters.
556: Line exceeds 78 characters.
570: Line exceeds 78 characters.
576: Line exceeds 78 characters.
582: Line exceeds 78 characters.
590: Line exceeds 78 characters.
596: Line exceeds 78 characters.
603: Line exceeds 78 characters.
614: Line exceeds 78 characters.
623: Line exceeds 78 characters.
630: Line exceeds 78 characters.
636: Line exceeds 78 characters.
643: Line exceeds 78 characters.
649: Line exceeds 78 characters.
655: Line exceeds 78 characters.
662: Line exceeds 78 characters.
669: Line exceeds 78 characters.
676: Line exceeds 78 characters.
683: Line exceeds 78 characters.
689: Line exceeds 78 characters.
Looks good. As agreed on IRC, please make test_poppy.py get poppy's port number from the config so you don't have to hard-code matching port numbers.
It's a good thing I'm reviewing this branch. It is going to clash with one I have pending, which puts buildd-manager in a read-only transaction policy by default. Build-master callbacks that need to write to the database will then have to open an explicit write transaction, make their changes, and commit before returning. Otherwise there seems to be a risk of another builder committing or aborting your changes while your builder is waiting for a slave XMLRPC call to return (and we've had reports of problems that seem to be symptoms of this actually happening).
Thanks for fixing this. Lack of monitoring of these jobs has been a thorn in my side for years now!