swarming: refactor cipd input

appengine/swarming/handlers_bot_test.py

 #!/usr/bin/env python
 # coding: utf-8
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 import base64
 import datetime
 import logging
 import os
@@ skipping 225 matching lines @@
     # Enqueue a task.
     _, task_id = self.client_create_task_raw()
     self.assertEqual('0', task_id[-1])
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     response = self.post_with_token('/swarming/api/v1/bot/poll', params, token)
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'client_package': {
+            u'package_name': 'infra/tools/cipd/${platform}',
+            u'version': 'git_revision:deadbeef',
+          },
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': 'git_revision:deadbeef',
+          }],
+          u'server': 'https://chrome-infra-packages.appspot.com',
+        },
         u'command': [u'python', u'run_test.py'],
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'grace_period': 30,
         u'hard_timeout': 3600,
         u'host': u'http://localhost:8080',
         u'isolated': None,
         u'io_timeout': 1200,
-        u'packages': [{
-          u'package_name': u'rm',
-          u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
-        }],
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
     response = self.client_get_results(task_id)
     expected = {
       u'bot_dimensions': [
         {u'key': u'id', u'value': [u'bot1']},
         {u'key': u'os', u'value': [u'Amiga']},
         {u'key': u'pool', u'value': [u'default']},
@@ skipping 25 matching lines @@
     # Enqueue a task.
     _, task_id = self.client_create_task_isolated()
     self.assertEqual('0', task_id[-1])
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     response = self.post_with_token('/swarming/api/v1/bot/poll', params, token)
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'client_package': {
+            u'package_name': 'infra/tools/cipd/${platform}',
+            u'version': 'git_revision:deadbeef',
+          },
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': 'git_revision:deadbeef',
+          }],
+          u'server': 'https://chrome-infra-packages.appspot.com',
+        },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'hard_timeout': 3600,
         u'grace_period': 30,
         u'host': u'http://localhost:8080',
         u'isolated': {
           u'input': u'0123456789012345678901234567890123456789',
           u'server': u'http://localhost:1',
           u'namespace': u'default-gzip',
         },
         u'io_timeout': 1200,
-        u'packages': [{
-          u'package_name': u'rm',
-          u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
-        }],
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
     # Complete the isolated task.
     params = {
       'cost_usd': 0.1,
       'duration': 3.,
       'bot_overhead': 0.1,
@@ skipping 81 matching lines @@
     token, params = self.get_bot_token()
     params['state']['lease_expiration_ts'] = (
         int(utils.time_time()) + 3600 + 1200 + 3 * 30 + 10 + 1)
     response = self.post_with_token('/swarming/api/v1/bot/poll', params, token)
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'client_package': {
+            u'package_name': 'infra/tools/cipd/${platform}',
+            u'version': 'git_revision:deadbeef',
+          },
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': 'git_revision:deadbeef',
+          }],
+          u'server': 'https://chrome-infra-packages.appspot.com',
+        },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'hard_timeout': 3600,
         u'grace_period': 30,
         u'host': u'http://localhost:8080',
         u'isolated': {
           u'input': u'0123456789012345678901234567890123456789',
           u'server': u'http://localhost:1',
           u'namespace': u'default-gzip',
         },
         u'io_timeout': 1200,
-        u'packages': [{
-          u'package_name': u'rm',
-          u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
-        }],
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
   def test_bot_ereporter2_error(self):
     # ereporter2's //client/utils/on_error.py traps unhandled exceptions
     # automatically.
     self.mock(random, 'getrandbits', lambda _: 0x88)
     errors = []
@@ skipping 416 matching lines @@
       self.assertEqual(expected, set(z.namelist()))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.CRITICAL,
       format='%(levelname)-7s %(filename)s:%(lineno)3d %(message)s')
   unittest.main()