Changeset 120452 in webkit

Timestamp:

Jun 15, 2012, 7:14:43 AM (14 years ago)

Author:

Csaba Osztrogonác

Message:

Update builder.html template for newer buildmaster
​https://bugs.webkit.org/show_bug.cgi?id=89207

Rebasing builder.html template from v0.8.3 to v0.8.6p1.

Reviewed by Zoltan Herczeg.

• BuildSlaveSupport/build.webkit.org-config/templates/builder.html:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/templates/builder.html (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/builder.html

@@ -22 +22 @@
     {{ b.current_step }}
 
-    {% if authz.advertiseAction('stopBuild') %}
+    {% if authz.advertiseAction('stopBuild', request) %}
       {{ forms.stop_build(b.stop_url, authz, on_all=False, short=True, label='Build') }}
     {% endif %}
@@ -38 +38 @@
     <li><small>({{ b.when }}, waiting {{ b.delay }})</small>
 
-    {% if authz.advertiseAction('cancelPendingBuild') %}
+    {% if authz.advertiseAction('cancelPendingBuild', request) %}
       {{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=True, id=b.id) }}
     {% endif %}
@@ -50 +50 @@
     {% endif %}
 
+      {% if 'owner' in b.properties %}
+        <b>Forced build</b>
+        by {{b.properties['owner'][0]}}
+        <small>{{b.properties['reason'][0]}}</small>
+      {% endif %}
     </li>
   {% endfor %}
   </ul>
 
-  {% if authz.advertiseAction('cancelPendingBuild') %}
+  {% if authz.advertiseAction('cancelPendingBuild', request) %}
     {{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=False, id='all') }}
   {% endif %}
@@ -98 +103 @@
 </table>
 
-{% if authz.advertiseAction('pingBuilder') %}
+{% if authz.advertiseAction('pingBuilder', request) %}
   <h2>Ping slaves</h2>
   {{ forms.ping_builder(builder_url+"/ping", authz) }}
 {% endif %}
 
-{% if authz.advertiseAction('forceBuild') %}
+{% if authz.advertiseAction('forceBuild', request) and force_schedulers != {} %}
   <h2>Force build</h2>
-  {{ forms.force_build(builder_url+"/force", authz, False) }}
+  {{ forms.force_build(builder_url+"/force", authz, request, False, force_schedulers=force_schedulers,default_props=default_props) }}
 {% endif %}
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-15  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Update builder.html template for newer buildmaster
+        https://bugs.webkit.org/show_bug.cgi?id=89207
+
+        Rebasing builder.html template from v0.8.3 to v0.8.6p1.
+
+        Reviewed by Zoltan Herczeg.
+
+        * BuildSlaveSupport/build.webkit.org-config/templates/builder.html:
+
 2012-06-15  Csaba Osztrogonác  <ossy@webkit.org>