swarming: refactor cipd input

appengine/swarming/handlers_bot_test.py

Index: appengine/swarming/handlers_bot_test.py
diff --git a/appengine/swarming/handlers_bot_test.py b/appengine/swarming/handlers_bot_test.py
index 7ef6429a219c66e4d91d4040f2e3bd3af985e8a2..1d31b8728c445916a43d044bf02e8062a8555b8c 100755
--- a/appengine/swarming/handlers_bot_test.py
+++ b/appengine/swarming/handlers_bot_test.py
@@ -243,6 +243,17 @@ class BotApiTest(test_env_handlers.AppTestBase):
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
+          }],
+          u'settings': {
+            u'server_host': 'chrome-infra-packages.appspot.com',
+            u'client_package_name': 'infra/tools/cipd/${platform}',
+            u'client_package_version': 'git_revision:deadbeef',
+          },
+        },
         u'command': [u'python', u'run_test.py'],
         u'dimensions': {
           u'os': u'Amiga',
@@ -255,10 +266,6 @@ class BotApiTest(test_env_handlers.AppTestBase):
         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,
       },
     }
@@ -304,6 +311,17 @@ class BotApiTest(test_env_handlers.AppTestBase):
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
+          }],
+          u'settings': {
+            u'server_host': 'chrome-infra-packages.appspot.com',
+            u'client_package_name': 'infra/tools/cipd/${platform}',
+            u'client_package_version': 'git_revision:deadbeef',
+          },
+        },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
@@ -320,10 +338,6 @@ class BotApiTest(test_env_handlers.AppTestBase):
           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,
       },
     }
@@ -425,6 +439,17 @@ class BotApiTest(test_env_handlers.AppTestBase):
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
+        u'cipd_input': {
+          u'packages': [{
+            u'package_name': u'rm',
+            u'version': test_env_handlers.PINNED_PACKAGE_VERSION,
+          }],
+          u'settings': {
+            u'server_host': 'chrome-infra-packages.appspot.com',
+            u'client_package_name': 'infra/tools/cipd/${platform}',
+            u'client_package_version': 'git_revision:deadbeef',
+          },
+        },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
@@ -441,10 +466,6 @@ class BotApiTest(test_env_handlers.AppTestBase):
           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,
       },
     }