Launchpad itself

Merge lp:~wgrant/launchpad/back-of-the-bus into lp:launchpad

  1. back-of-the-bus
  2. Merge into devel
Proposed by William Grant
Status: Merged
Merged at revision: 18213
Proposed branch: lp:~wgrant/launchpad/back-of-the-bus
Merge into: lp:launchpad
Diff against target: 88 lines (+16/-16)
4 files modified
lib/lp/buildmaster/browser/builder.py (+1/-1)
lib/lp/buildmaster/stories/xx-builder-page.txt (+2/-2)
lib/lp/buildmaster/stories/xx-buildfarm-index.txt (+5/-4)
lib/lp/buildmaster/templates/builders-index.pt (+8/-9)
To merge this branch: bzr merge lp:~wgrant/launchpad/back-of-the-bus
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+307432@code.launchpad.net

Commit message

Shove non-virts to the bottom of /builders. Ubuntu's now mostly scalingstack.

Description of the change

powerpc and s390x needn't be in prime position on /builders.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/buildmaster/browser/builder.py'
2--- lib/lp/buildmaster/browser/builder.py 2015-07-23 16:41:12 +0000
3+++ lib/lp/buildmaster/browser/builder.py 2016-10-03 13:15:45 +0000
4@@ -154,7 +154,7 @@
5 @staticmethod
6 def getBuilderSortKey(builder):
7 return (
8- builder.virtualized,
9+ not builder.virtualized,
10 tuple(p.name for p in builder.processors),
11 builder.name)
12
13
14=== modified file 'lib/lp/buildmaster/stories/xx-builder-page.txt'
15--- lib/lp/buildmaster/stories/xx-builder-page.txt 2016-01-26 15:47:37 +0000
16+++ lib/lp/buildmaster/stories/xx-builder-page.txt 2016-10-03 13:15:45 +0000
17@@ -264,11 +264,11 @@
18 frog Disabled
19 victim Idle
20 Updated on ...
21- Non-virtual build status
22- Architecture Builders Queue
23 Virtual build status
24 Architecture Builders Queue
25 386 1 empty
26+ Non-virtual build status
27+ Architecture Builders Queue
28
29 >>> cprov_browser.getLink('bob').click()
30 Traceback (most recent call last):
31
32=== modified file 'lib/lp/buildmaster/stories/xx-buildfarm-index.txt'
33--- lib/lp/buildmaster/stories/xx-buildfarm-index.txt 2015-09-11 13:56:38 +0000
34+++ lib/lp/buildmaster/stories/xx-buildfarm-index.txt 2016-10-03 13:15:45 +0000
35@@ -18,14 +18,15 @@
36 1 available build machine, 1 disabled and 1 building of a total of
37 2 registered.
38 386
39+ frog Disabled
40+ 386
41 bob Building i386 build of mozilla-firefox 0.9 ...
42- frog Disabled
43+ Virtual build status
44+ Architecture Builders Queue
45+ 386 0 empty
46 Non-virtual build status
47 Architecture Builders Queue
48 386 1 1 job (1 minute)
49- Virtual build status
50- Architecture Builders Queue
51- 386 0 empty
52
53 When building, the 'Status' column contains a link to the
54 corresponding 'Build' page.
55
56=== modified file 'lib/lp/buildmaster/templates/builders-index.pt'
57--- lib/lp/buildmaster/templates/builders-index.pt 2015-03-24 11:30:04 +0000
58+++ lib/lp/buildmaster/templates/builders-index.pt 2016-10-03 13:15:45 +0000
59@@ -80,6 +80,14 @@
60 </div><!-- yui-u -->
61
62 <div class="yui-u">
63+ <div id="virt-queue-status" class="portlet">
64+ <div tal:define="category view/virt_builders">
65+ <div metal:use-macro="template/macros/builder-category" />
66+ </div>
67+ </div><!-- portlet -->
68+ </div><!-- yui-u -->
69+
70+ <div class="yui-u">
71 <div id="nonvirt-queue-status" class="portlet">
72 <div tal:define="category view/nonvirt_builders">
73 <div metal:use-macro="template/macros/builder-category" />
74@@ -87,15 +95,6 @@
75 </div><!-- portlet -->
76 </div><!-- yui-u -->
77
78- <div class="yui-u">
79- <div id="virt-queue-status" class="portlet">
80- <div tal:define="category view/virt_builders">
81- <div metal:use-macro="template/macros/builder-category" />
82- </div>
83- </div><!-- portlet -->
84- </div><!-- yui-u -->
85-
86-
87 </div><!-- yui-ge -->
88 </div> <!-- main -->
89