Complete CIPD integration

appengine/swarming/templates/user_task.html

 {% extends "swarming/base.html" %}
 
 
 {% block headers %}
 <style>
   h1 {
     margin-top: 10px;
     margin-bottom: 10px;
   }
 
@@ skipping 201 matching lines @@
           <td>{{request.properties.io_timeout_secs}}</td>
         </tr>
         <tr title="Additional environment variables to the one provided by the bot.">
           <td>Env vars</td>
           <td>{{bot_view.render_dict(request.properties.env)}}</td>
         </tr>
         <tr title="If True, successful task results may be reused for subsequent requests, so the task can be deduped.">
           <td>Idempotent</td>
           <td>{{request.properties.idempotent}}</td>
         </tr>
+        {% if request.properties.cipd_input %}
+          <tr title="CIPD server">
+            <td>CIPD server</td>
+            <td>{{request.properties.cipd_input.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>{{request.properties.cipd_input.packages|join('<br>'|safe)}}</td>
+          </tr>
+        {% endif %}
         {% if request.properties.inputs_ref and request.properties.inputs_ref.isolated %}
           <tr title="Inputs files">
             <td>Isolated inputs</td>
             <td>
               <a
                 href="{{request.properties.inputs_ref.isolatedserver}}/browse?namespace={{request.properties.inputs_ref.namespace}}&hash={{request.properties.inputs_ref.isolated}}">
                 {{request.properties.inputs_ref.isolated}}
               </a>
             </td>
           </tr>
@@ skipping 191 matching lines @@
         <td>Pending time</td>
         <td>
           {{bot_view.pending_star(task)}}{{task.pending_now(now)|timedeltaformat(include_ms=True)}}
         </td>
       </tr>
       <tr title="Duration of the task, up to now if the task is still on-going.">
         <td>Duration </td>
         <td>{{task.duration_now(now)|timedeltaformat(include_ms=True)}}</td>
       </tr>
       {% if task.performance_stats_key %}
+        <tr title="Overhead from installing CIPD packages">
+          <td>Overhead CIPD packages</td>
+          <td>{{task.overhead_package_installation|timedeltaformat(include_ms=True)}}</td>
+        </tr>
         <tr title="Overhead from installing isolated inputs">
           <td>Overhead isolated inputs</td>
           <td>{{task.overhead_isolated_inputs|timedeltaformat(include_ms=True)}}</td>
         </tr>
         <tr title="Overhead from pushing isolated outputs">
           <td>Overhead isolated outputs</td>
           <td>{{task.overhead_isolated_outputs|timedeltaformat(include_ms=True)}}</td>
         </tr>
       {% endif %}
       <tr title="Overhead from task_runner This is bot side overheads excluding isolated setup and teardown.">
@@ skipping 67 matching lines @@
 
 {% set output = task.get_output() %}
 {% if output is not none %}
 <h3>Output:</h3>
 <pre>
 {{task.get_output().decode('utf-8', 'replace')}}{% if is_running %}<p class="console"><span class="blink">|</span>{% endif %}
 </pre>
 {% endif %}
 
 {% endblock %}