launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/back-of-the-bus into lp:launchpad.

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/back-of-the-bus/+merge/307432

powerpc and s390x needn't be in prime position on /builders.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/back-of-the-bus into lp:launchpad.

=== modified file 'lib/lp/buildmaster/browser/builder.py'
--- lib/lp/buildmaster/browser/builder.py	2015-07-23 16:41:12 +0000
+++ lib/lp/buildmaster/browser/builder.py	2016-10-03 13:06:27 +0000
@@ -154,7 +154,7 @@
     @staticmethod
     def getBuilderSortKey(builder):
         return (
-            builder.virtualized,
+            not builder.virtualized,
             tuple(p.name for p in builder.processors),
             builder.name)
 

=== modified file 'lib/lp/buildmaster/stories/xx-builder-page.txt'
--- lib/lp/buildmaster/stories/xx-builder-page.txt	2016-01-26 15:47:37 +0000
+++ lib/lp/buildmaster/stories/xx-builder-page.txt	2016-10-03 13:06:27 +0000
@@ -264,11 +264,11 @@
     frog   Disabled
     victim Idle
     Updated on ...
-    Non-virtual build status
-    Architecture Builders Queue
     Virtual build status
     Architecture Builders Queue
     386          1        empty
+    Non-virtual build status
+    Architecture Builders Queue
 
     >>> cprov_browser.getLink('bob').click()
     Traceback (most recent call last):

=== modified file 'lib/lp/buildmaster/stories/xx-buildfarm-index.txt'
--- lib/lp/buildmaster/stories/xx-buildfarm-index.txt	2015-09-11 13:56:38 +0000
+++ lib/lp/buildmaster/stories/xx-buildfarm-index.txt	2016-10-03 13:06:27 +0000
@@ -18,14 +18,15 @@
     1 available build machine, 1 disabled and 1 building of a total of
     2 registered.
     386
+    frog  Disabled
+    386
     bob   Building i386 build of mozilla-firefox 0.9 ...
-    frog  Disabled
+    Virtual build status
+    Architecture  Builders  Queue
+    386           0         empty
     Non-virtual build status
     Architecture  Builders  Queue
     386           1         1 job (1 minute)
-    Virtual build status
-    Architecture  Builders  Queue
-    386           0         empty
 
 When building, the 'Status' column contains a link to the
 corresponding 'Build' page.

=== modified file 'lib/lp/buildmaster/templates/builders-index.pt'
--- lib/lp/buildmaster/templates/builders-index.pt	2015-03-24 11:30:04 +0000
+++ lib/lp/buildmaster/templates/builders-index.pt	2016-10-03 13:06:27 +0000
@@ -80,6 +80,14 @@
        </div><!-- yui-u -->
 
        <div class="yui-u">
+         <div id="virt-queue-status" class="portlet">
+           <div tal:define="category view/virt_builders">
+             <div metal:use-macro="template/macros/builder-category" />
+           </div>
+         </div><!-- portlet -->
+       </div><!-- yui-u -->
+
+       <div class="yui-u">
          <div id="nonvirt-queue-status" class="portlet">
            <div tal:define="category view/nonvirt_builders">
              <div metal:use-macro="template/macros/builder-category" />
@@ -87,15 +95,6 @@
          </div><!-- portlet -->
        </div><!-- yui-u -->
 
-       <div class="yui-u">
-         <div id="virt-queue-status" class="portlet">
-           <div tal:define="category view/virt_builders">
-             <div metal:use-macro="template/macros/builder-category" />
-           </div>
-         </div><!-- portlet -->
-       </div><!-- yui-u -->
-
-
      </div><!-- yui-ge -->
     </div> <!-- main -->