Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1827)

Unified Diff: appengine/swarming/templates/user_task.html

Issue 2267363004: Add CIPD pin reporting to swarming. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master
Patch Set: Fix bottest Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « appengine/swarming/swarming_rpcs.py ('k') | client/cipd.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/templates/user_task.html
diff --git a/appengine/swarming/templates/user_task.html b/appengine/swarming/templates/user_task.html
index 8f7ecc5aa6b428c6166eb058ddac6932abb96ff7..9f6e019ed3b6205b3e2048819d3739ac149f0297 100644
--- a/appengine/swarming/templates/user_task.html
+++ b/appengine/swarming/templates/user_task.html
@@ -73,6 +73,14 @@
.package-list {
margin-left: 1em;
}
+
+ .package-pin-name {
+ font-weight: bold;
+ }
+
+ .package-pin-version {
+ color: blue;
+ }
</style>
{% endblock %}
@@ -223,26 +231,28 @@
<td>Idempotent</td>
<td>{{request.properties.idempotent}}</td>
</tr>
- {% if request.properties.cipd_input %}
+ {% if cipd %}
<tr title="CIPD server">
<td>CIPD server</td>
- <td>{{request.properties.cipd_input.server}}</td>
+ <td>{{cipd.server}}</td>
</tr>
<tr title="CIPD client">
<td>CIPD client</td>
- <td>{{request.properties.cipd_input.client_package}}</td>
- </tr>
- <tr title="CIPD pacakges">
- <td>CIPD packages</td>
- <td>
- {% for path, packages in request.properties.cipd_input.packages_grouped_by_path() %}
- <div>{{ path or '.'}}/</div>
- <div class="package-list">
- {{packages|join('<br>'|safe)}}
- </div>
- {% endfor %}
- </td>
+ <td>{{cipd.client_package}}</td>
</tr>
+ {% if cipd.packages %}
+ <tr title="CIPD pacakges">
+ <td>CIPD packages</td>
+ <td>
+ {% for path, packages in cipd.packages %}
+ <div>{{path or '.'}}/</div>
+ <div class="package-list">
+ {{packages|join('<br>'|safe)}}
+ </div>
+ {% endfor %}
+ </td>
+ </tr>
+ {% endif %}
{% endif %}
{% if request.properties.inputs_ref and request.properties.inputs_ref.isolated %}
<tr title="Inputs files">
@@ -418,6 +428,25 @@
{% endif %}
</td>
</tr>
+ {% if cipd_pins %}
+ <tr title="CIPD client">
+ <td>CIPD client</td>
+ <td>{{cipd_pins.client_package}}</td>
+ </tr>
+ {% if cipd_pins.packages %}
+ <tr title="CIPD pacakges">
+ <td>CIPD packages</td>
+ <td>
+ {% for path, packages in cipd_pins.packages %}
+ <div>{{path or '.'}}/</div>
+ <div class="package-list">
+ {{packages|join('<br>'|safe)}}
+ </div>
+ {% endfor %}
+ </td>
+ </tr>
+ {% endif %}
+ {% endif %}
<tr title="Current bot version. TODO(maruel): List bot version at time of task reaping.">
<td>Bot version</td>
<td>{{task.bot_version}}</td>
« no previous file with comments | « appengine/swarming/swarming_rpcs.py ('k') | client/cipd.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698