Launchpad itself

Merge lp:~rockstar/launchpad/enable-edge-recipe-builds into lp:launchpad

  1. enable-edge-recipe-builds
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Edwin Grubbs
Approved revision: no longer in the source branch.
Merged at revision: 10856
Proposed branch: lp:~rockstar/launchpad/enable-edge-recipe-builds
Merge into: lp:launchpad
Diff against target: 265 lines (+114/-125)
3 files modified
configs/development/build-from-branch.zcml (+0/-124)
lib/canonical/config/schema-lazr.conf (+1/-1)
lib/lp/code/browser/configure.zcml (+113/-0)
To merge this branch: bzr merge lp:~rockstar/launchpad/enable-edge-recipe-builds
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) Approve
Review via email: mp+25175@code.launchpad.net

Description of the change

This branch just enables the build_from_branch stuff globally, and removes the
development/testrunner specific parts. We want this functionality on edge
yesterday! :)

To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'configs/development/build-from-branch.zcml'
--- configs/development/build-from-branch.zcml 2010-04-29 16:38:00 +0000
+++ configs/development/build-from-branch.zcml 1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
1<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
2 GNU Affero General Public License version 3 (see the file LICENSE).
3-->
4
5<configure
6 xmlns="http://namespaces.zope.org/zope"
7 xmlns:browser="http://namespaces.zope.org/browser"
8 xmlns:i18n="http://namespaces.zope.org/i18n"
9 xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
10 i18n_domain="launchpad">
11 <browser:navigation
12 module="lp.code.browser.sourcepackagerecipe"
13 classes="SourcePackageRecipeNavigation
14 SourcePackageRecipeBuildNavigation" />
15
16 <facet facet="branches">
17
18 <browser:defaultView
19 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
20 name="+index"
21 layer="canonical.launchpad.layers.CodeLayer"/>
22 <browser:page
23 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
24 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
25 name="+index"
26 template="../../lib/lp/code/templates/sourcepackagerecipe-index.pt"
27 permission="launchpad.View"/>
28 <browser:page
29 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
30 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
31 name="+request-builds"
32 template="../../lib/lp/code/templates/sourcepackagerecipe-request-builds.pt"
33 permission="launchpad.View"/>
34 </facet>
35 <facet facet="branches">
36 <browser:defaultView
37 for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
38 name="+index"
39 layer="canonical.launchpad.layers.CodeLayer"/>
40 <browser:page
41 for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
42 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
43 name="+index"
44 template="../../lib/lp/code/templates/sourcepackagerecipebuild-index.pt"
45 permission="launchpad.View"/>
46 <browser:menus
47 classes="
48 SourcePackageRecipeNavigationMenu
49 SourcePackageRecipeContextMenu"
50 module="lp.code.browser.sourcepackagerecipe"/>
51
52 <browser:page
53 for="lp.code.interfaces.branch.IBranch"
54 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
55 permission="zope.Public"
56 facet="branches"
57 name="+new-recipe"
58 template="../../lib/lp/app/templates/generic-edit.pt"/>
59 <browser:page
60 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
61 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
62 permission="zope.Public"
63 facet="branches"
64 name="+edit"
65 template="../../lib/lp/app/templates/generic-edit.pt"/>
66 <browser:page
67 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
68 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
69 permission="zope.Public"
70 facet="branches"
71 name="+delete"
72 template="../../lib/lp/app/templates/generic-edit.pt"/>
73
74
75 <browser:page
76 for="lp.code.interfaces.branch.IBranch"
77 class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
78 permission="zope.Public"
79 facet="branches"
80 name="+recipes"
81 template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
82 <browser:page
83 for="lp.registry.interfaces.product.IProduct"
84 class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
85 permission="zope.Public"
86 facet="branches"
87 name="+recipes"
88 template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
89 <browser:page
90 for="lp.registry.interfaces.person.IPerson"
91 class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
92 permission="zope.Public"
93 facet="branches"
94 name="+recipes"
95 template="../../lib/lp/code/templates/sourcepackagerecipe-listing.pt"/>
96
97 <browser:page
98 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
99 name="+hierarchy"
100 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
101 template="../../lib/lp/app/templates/launchpad-hierarchy.pt"
102 permission="zope.Public"/>
103
104 <adapter
105 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
106 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
107 factory="canonical.launchpad.webapp.breadcrumb.NameBreadcrumb"
108 permission="zope.Public"/>
109 </facet>
110 <securedutility
111 name="BuildableDistroSeries"
112 component="lp.code.browser.sourcepackagerecipe.buildable_distroseries_vocabulary"
113 provides="zope.schema.interfaces.IVocabularyFactory"
114 >
115 <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
116 </securedutility>
117 <securedutility
118 name="TargetPPAs"
119 component="lp.code.browser.sourcepackagerecipe.target_ppas_vocabulary"
120 provides="zope.schema.interfaces.IVocabularyFactory"
121 >
122 <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
123 </securedutility>
124</configure>
1250
=== removed symlink 'configs/testrunner/build-from-branch.zcml'
=== target was u'../development/build-from-branch.zcml'
=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf 2010-05-11 16:02:51 +0000
+++ lib/canonical/config/schema-lazr.conf 2010-05-12 17:29:30 +0000
@@ -167,7 +167,7 @@
167167
168168
169[build_from_branch]169[build_from_branch]
170enabled = False170enabled = True
171171
172172
173# Configuration for spawned Bazaar subprocesses.173# Configuration for spawned Bazaar subprocesses.
174174
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2010-04-28 22:03:05 +0000
+++ lib/lp/code/browser/configure.zcml 2010-05-12 17:29:30 +0000
@@ -1096,4 +1096,117 @@
1096 path_expression="string:+build/${id}"1096 path_expression="string:+build/${id}"
1097 rootsite="code" />1097 rootsite="code" />
10981098
1099 <browser:navigation
1100 module="lp.code.browser.sourcepackagerecipe"
1101 classes="SourcePackageRecipeNavigation
1102 SourcePackageRecipeBuildNavigation" />
1103
1104 <facet facet="branches">
1105
1106 <browser:defaultView
1107 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1108 name="+index"
1109 layer="canonical.launchpad.layers.CodeLayer"/>
1110 <browser:page
1111 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1112 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeView"
1113 name="+index"
1114 template="../templates/sourcepackagerecipe-index.pt"
1115 permission="launchpad.View"/>
1116 <browser:page
1117 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1118 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeRequestBuildsView"
1119 name="+request-builds"
1120 template="../templates/sourcepackagerecipe-request-builds.pt"
1121 permission="launchpad.View"/>
1122 </facet>
1123 <facet facet="branches">
1124 <browser:defaultView
1125 for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
1126 name="+index"
1127 layer="canonical.launchpad.layers.CodeLayer"/>
1128 <browser:page
1129 for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
1130 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeBuildView"
1131 name="+index"
1132 template="../templates/sourcepackagerecipebuild-index.pt"
1133 permission="launchpad.View"/>
1134 <browser:menus
1135 classes="
1136 SourcePackageRecipeNavigationMenu
1137 SourcePackageRecipeContextMenu"
1138 module="lp.code.browser.sourcepackagerecipe"/>
1139
1140 <browser:page
1141 for="lp.code.interfaces.branch.IBranch"
1142 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
1143 permission="zope.Public"
1144 facet="branches"
1145 name="+new-recipe"
1146 template="../../app/templates/generic-edit.pt"/>
1147 <browser:page
1148 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1149 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
1150 permission="zope.Public"
1151 facet="branches"
1152 name="+edit"
1153 template="../../app/templates/generic-edit.pt"/>
1154 <browser:page
1155 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1156 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeDeleteView"
1157 permission="zope.Public"
1158 facet="branches"
1159 name="+delete"
1160 template="../../app/templates/generic-edit.pt"/>
1161
1162 <browser:page
1163 for="lp.code.interfaces.branch.IBranch"
1164 class="lp.code.browser.sourcepackagerecipelisting.BranchRecipeListingView"
1165 permission="zope.Public"
1166 facet="branches"
1167 name="+recipes"
1168 template="../templates/sourcepackagerecipe-listing.pt"/>
1169 <browser:page
1170 for="lp.registry.interfaces.product.IProduct"
1171 class="lp.code.browser.sourcepackagerecipelisting.ProductRecipeListingView"
1172 permission="zope.Public"
1173 facet="branches"
1174 name="+recipes"
1175 template="../templates/sourcepackagerecipe-listing.pt"/>
1176 <browser:page
1177 for="lp.registry.interfaces.person.IPerson"
1178 class="lp.code.browser.sourcepackagerecipelisting.PersonRecipeListingView"
1179 permission="zope.Public"
1180 facet="branches"
1181 name="+recipes"
1182 template="../templates/sourcepackagerecipe-listing.pt"/>
1183
1184 <browser:page
1185 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1186 name="+hierarchy"
1187 class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeHierarchy"
1188 template="../../app/templates/launchpad-hierarchy.pt"
1189 permission="zope.Public"/>
1190
1191 <adapter
1192 provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
1193 for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
1194 factory="canonical.launchpad.webapp.breadcrumb.NameBreadcrumb"
1195 permission="zope.Public"/>
1196 </facet>
1197 <securedutility
1198 name="BuildableDistroSeries"
1199 component="lp.code.browser.sourcepackagerecipe.buildable_distroseries_vocabulary"
1200 provides="zope.schema.interfaces.IVocabularyFactory"
1201 >
1202 <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
1203 </securedutility>
1204 <securedutility
1205 name="TargetPPAs"
1206 component="lp.code.browser.sourcepackagerecipe.target_ppas_vocabulary"
1207 provides="zope.schema.interfaces.IVocabularyFactory"
1208 >
1209 <allow interface="zope.schema.interfaces.IVocabularyFactory"/>
1210 </securedutility>
1211
1099</configure>1212</configure>