archive/blender-buildbot
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Variety of fixes all over the place

Browse Source 
Makes buildbot more usable, but still tweaks are needed.
This commit is contained in:
Sergey Sharybin
2015-06-20 21:15:24 +02:00
parent 96b04687a2
commit c4b9358874
8 changed files with 314 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
templates/forms.html
View File

@@ -114,11 +114,13 @@
{% endif %}
{% endmacro %}
{# TODO(sergey): Move hardcoded span with inline-block into a CSS class. #}
{% macro force_build_scheduler_parameter(f, authz, request, sch, default_props) %}
{% if f and not f.hide and (f.fullName != "username" or not authz.authenticated(request)) %}
<div class="row{% for subtype in f.type %} force-{{subtype}}{%endfor%}"{% if f.name %} id="force-{{sch.name}}-{{f.fullName}}"{% endif %}>
<div class="{% for subtype in f.type %} force-{{subtype}}{%endfor%}"{% if f.name %} id="force-{{sch.name}}-{{f.fullName}}"{% endif %}><p>
{% if 'text' in f.type or 'int' in f.type %}
<span class="label">{{f.label}}</span>
<span style="display: inline-block; width: 20%;">{{f.label}}</span>
<input type='text' size='{{f.size}}' name='{{f.fullName}}' value='{{default_props[sch.name+"."+f.fullName]}}' />
{% elif 'bool' in f.type%}
<input type='checkbox' name='checkbox' value='{{f.fullName}}' {{default_props[sch.name+"."+f.fullName]}} />
@@ -127,7 +129,7 @@
<span class="label">{{f.label}}</span>
<textarea name='{{f.fullName}}' rows={{f.rows}} cols={{f.cols}}>{{default_props[sch.name+"."+f.fullName]}}</textarea>
{% elif 'list' in f.type %}
<span class="label">{{f.label}}</span>
<span style="display: inline-block; width: 20%;">{{f.label}}</span>
<span class="select">
<select name='{{f.fullName}}' {{ f.multiple and "multiple" or ""}}>
{% for c in default_props[sch.name+"."+f.fullName+".choices"] %}
@@ -136,12 +138,12 @@
</select>
</span>
{% elif 'nested' in f.type %}
{% if f.label %}<span class="label">{{f.label}}</span>{% endif %}
{% if f.label %}<span>{{f.label}}</span>{% endif %}
{% for subfield in f.fields %}
{{ force_build_scheduler_parameter(subfield, authz, request, sch, default_props) }}
{% endfor %}
{% endif %}
</div>
</p></div>
{% endif %}
{% endmacro %}
@@ -176,15 +178,16 @@
{% for f in sch.all_fields %}
{{ force_build_scheduler_parameter(f, authz, request, sch, default_props) }}
{% endfor %}
<input class="btn btn-default btn-success btn-squishy" type="submit" value="{{ sch.buttonName }}" />
<hr>
<p><input class="btn btn-default btn-success btn-squishy btn-block" type="submit" value="{{ sch.buttonName }}" /></p>
</form>
{% endmacro %}
{% macro force_build(force_url, authz, request, on_all=False, on_selected=False, builders=[], force_schedulers={},default_props={}) %}
<div class="box">
{% for name, sch in force_schedulers.items() | sort %}
{{ force_build_one_scheduler(force_url, authz, request, on_all, on_selected, builders, sch, default_props=default_props) }}
{% endfor %}
</div>
{% endmacro %}
{% macro graceful_shutdown(shutdown_url, authz) %}
@@ -242,26 +245,28 @@
{% macro rebuild_build(rebuild_url, authz, ss) %}
<form method="post" action="{{ rebuild_url }}" class="form-horizontal rebuild">
<div class="box">
{% if on_all %}
<p>To force a build on <strong>all Builders</strong>, fill out the following fields
and push the 'Force Build' button</p>
{% else %}
<p>To force a build, fill out the following fields and
push the 'Force Build' button</p>
push the 'Rebuild' button</p>
{% endif %}
<div class="row">
<span class="label">Reason for re-running build:</span>
<p>
<span style="display: inline-block; width: 20%;">Reason for re-running build:</span>
<input type='text' name='comments' />
</div>
<div class="row">
Rebuild using:
</p>
<p>
<span style="display: inline-block; width: 20%;">Rebuild using:</span>
<select name="useSourcestamp">
<option value='exact' selected>Exact same revisions</option>
<option value='updated'>Same sourcestamps (ignoring 'got revision')</option>
</select>
</div>
<input class="btn btn-default btn-success btn-squishy" type="submit" value="Rebuild" />
</p>
<hr>
<p><input class="btn btn-default btn-success btn-squishy btn-block" type="submit" value="Rebuild" /></p>
</div>
</form>
{% endmacro %}