Add support for swarming priority and expiration in the test spec

scripts/slave/recipe_modules/swarming/api.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import functools
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 
 # Minimally supported version of swarming.py script (reported by --version).
 MINIMAL_SWARMING_VERSION = (0, 4, 10)
 
+NAMED_PRIORITIES = {

[M-A Ruel, 2016/03/23 12:55:32]

I wonder if it should go in chromium_tests or here.

[Sergiy Byelozyorov, 2016/03/23 13:58:53]

I don't have a strong preference. But if it goes to chromium_tests, I can't use
'default' and 'min'/'max' in this module.

+  'min': 1,        # higest possible priority

[M-A Ruel, 2016/03/23 12:55:32]

The infrastructure should never use anything below 10 (e.g. higher priority than
10) so change 'min' accordingly.

[Sergiy Byelozyorov, 2016/03/23 13:58:53]

Done. Note that this also changes the logic of the default_priority setter as it
checks for values to be between min and max.

+  'higher': 25,    # used by most masters
+  'normal': 30,    # used by CQ
+  'lower': 35,     # used by chromium.fyi
+  'default': 200,  # very low, should be increased depending on the type of task
+  'max': 255,      # lowest possible priority

[M-A Ruel, 2016/03/23 12:55:31]

You should use 'highest' and 'lowest' to reduce confusion.

[Sergiy Byelozyorov, 2016/03/23 13:58:53]

Done.

+}
+
 
 def parse_time(value):
   """Converts serialized time from the API to datetime.datetime."""
   # When microseconds are 0, the '.123456' suffix is elided. This means the
   # serialized format is not consistent, which confuses the hell out of python.
   # TODO(maruel): Remove third format once we enforce version >=0.8.2.
   for fmt in ('%Y-%m-%dT%H:%M:%S.%f', '%Y-%m-%dT%H:%M:%S', '%Y-%m-%d %H:%M:%S'):
     try:
       return datetime.datetime.strptime(value, fmt)
     except ValueError:  # pragma: no cover
@@ skipping 71 matching lines @@
     self._default_dimensions = {
       'cpu': 'x86-64',
       'gpu': 'none',
     }
     # Expirations are set to mildly good values and will be tightened soon.
     self._default_expiration = 60*60
     self._default_env = {}
     self._default_hard_timeout = 60*60
     self._default_idempotent = False
     self._default_io_timeout = 20*60
-    # The default priority is extremely low and should be increased dependending
-    # on the type of task.
-    self._default_priority = 200
+    self._default_priority = NAMED_PRIORITIES['default']
     self._default_tags = set()
     self._default_user = None
     self._pending_tasks = set()
     self._show_isolated_out_in_collect_step = True
     self._show_shards_in_collect_step = False
     self._swarming_server = 'https://chromium-swarm.appspot.com'
     self._verbose = False
 
   @property
   def swarming_server(self):
@@ skipping 150 matching lines @@
 
     Priority ranges from 1 to 255. The lower the value, the most important the
     task is and will preempty any task with a lower priority.
 
     This value can be changed per individual task.
     """
     return self._default_priority
 
   @default_priority.setter
   def default_priority(self, value):
-    assert 1 <= value <= 255
+    assert NAMED_PRIORITIES['min'] <= value <= NAMED_PRIORITIES['max']
     self._default_priority = value
 
   def add_default_tag(self, tag):
     """Adds a tag to the Swarming tasks triggered.
 
     Tags are used for maintenance, they can be used to calculate the number of
     tasks run for a day to calculate the cost of a type of type (CQ, ASAN, etc).
 
     Tags can be added per individual task.
     """
@@ skipping 284 matching lines @@
 
     Deprecated, to be removed soon. Use 'collect_task' in a loop instead,
     properly handling exceptions. This method doesn't handle collect failures
     well (it aborts on a first failure).
     """
     return [self.collect_task(t, **kwargs) for t in tasks]
 
   # To keep compatibility with some build_internal code. To be removed as well.
   collect_each = collect
 
+  def parse_priority_adjustment(self, adjustment):
+    if isinstance(adjustment, basestring) and adjustment in NAMED_PRIORITIES:
+      return NAMED_PRIORITIES[adjustment]
+
+    try:
+      return int(adjustment)

[M-A Ruel, 2016/03/23 12:55:31]

I prefer to not support that and just use names for now. It's more futureproof.

[Sergiy Byelozyorov, 2016/03/23 13:58:53]

Done.

+    except (ValueError, TypeError):
+      return None
+
   @staticmethod
   def _display_pending(summary_json, step_presentation):
     """Shows max pending time in seconds across all shards if it exceeds 10s."""
     pending_times = [
       (parse_time(shard['started_ts']) -
         parse_time(shard['created_ts'])).total_seconds()
       for shard in summary_json.get('shards', []) if shard.get('started_ts')
     ]
     max_pending = max(pending_times) if pending_times else 0
 
@@ skipping 334 matching lines @@
 
   def get_shard_view_url(self, index):
     """Returns URL of HTML page with shard details or None if not available.
 
     Works only after the task has been successfully triggered.
     """
     if self._trigger_output and self._trigger_output.get('tasks'):
       for shard_dict in self._trigger_output['tasks'].itervalues():
         if shard_dict['shard_index'] == index:
           return shard_dict['view_url']