[toolchain-utils] Remove --remote-description flag.

The cros tryjob command no longer recognizes this flag so we need
to remove it from our scripts.

BUG=chromium:833542
TEST=Tested with launching the rotating builders on chrotomation2.

Change-Id: Ifcf62ae7073d84a9f58e12c29dcce5cdf9108e9f
Reviewed-on: https://chromium-review.googlesource.com/1014369
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

4 files changed, 21 insertions, 31 deletions

diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py
index 1ed877f1..1d388c3f 100755
--- a/buildbot_test_llvm.py
+++ b/buildbot_test_llvm.py
@@ -124,14 +124,10 @@ class ToolchainVerifier(object):
     Launch trybot, get image names, create crosperf experiment file, run
     crosperf, and copy images into seven-day report directories.
     """
-    date_str = datetime.date.today()
-    description = 'master_%s_%s_%s' % (self._patches_string, self._build,
-                                       date_str)
     _ = buildbot_utils.GetTrybotImage(
         self._chromeos_root,
         self._build,
         self._patches,
-        description,
         tryjob_flags=['--hwtest'],
         async=True)
 
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index 78825233..38754426 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -258,14 +258,10 @@ class ToolchainComparator(object):
     Launch trybot, get image names, create crosperf experiment file, run
     crosperf, and copy images into seven-day report directories.
     """
-    date_str = datetime.date.today()
-    description = 'master_%s_%s_%s' % (self._patches_string, self._build,
-                                       date_str)
     buildbucket_id, trybot_image = buildbot_utils.GetTrybotImage(
         self._chromeos_root,
         self._build,
         self._patches,
-        description,
         tryjob_flags=['--notests'],
         build_toolchain=True)
 
diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py
index 7b8f1008..29bed72a 100644
--- a/cros_utils/buildbot_utils.py
+++ b/cros_utils/buildbot_utils.py
@@ -80,7 +80,6 @@ def ParseTryjobBuildbucketId(msg):
 def SubmitTryjob(chromeos_root,
                  buildbot_name,
                  patch_list,
-                 build_tag,
                  tryjob_flags=None,
                  build_toolchain=False):
   """Calls `cros tryjob ...`
@@ -91,8 +90,6 @@ def SubmitTryjob(chromeos_root,
     buildbot_name: the name of the buildbot queue, such as lumpy-release or
                    daisy-paladin.
     patch_list: a python list of the patches, if any, for the buildbot to use.
-    build_tag: a (unique) string to be used to look up the buildbot results
-               from among all the build records.
     tryjob_flags: See cros tryjob --help for available options.
     build_toolchain: builds and uses the latest toolchain, rather than the
                      prebuilt one in SDK.
@@ -112,9 +109,8 @@ def SubmitTryjob(chromeos_root,
 
   # Launch buildbot with appropriate flags.
   build = buildbot_name
-  description = build_tag
-  command = ('cros tryjob --yes --json --nochromesdk --remote-description %s'
-             ' %s %s %s' % (description, tryjob_flags, patch_arg, build))
+  command = ('cros tryjob --yes --json --nochromesdk  %s %s %s' %
+             (tryjob_flags, patch_arg, build))
   print('CMD: %s' % command)
   _, out, _ = RunCommandInPath(chromeos_root, command)
   buildbucket_id = ParseTryjobBuildbucketId(out)
@@ -128,7 +124,6 @@ def SubmitTryjob(chromeos_root,
 def GetTrybotImage(chromeos_root,
                    buildbot_name,
                    patch_list,
-                   build_tag,
                    tryjob_flags=None,
                    build_toolchain=False,
                    async=False):
@@ -146,8 +141,6 @@ def GetTrybotImage(chromeos_root,
     buildbot_name: the name of the buildbot queue, such as lumpy-release or
                    daisy-paladin.
     patch_list: a python list of the patches, if any, for the buildbot to use.
-    build_tag: a (unique) string to be used to look up the buildbot results
-               from among all the build records.
     tryjob_flags: See cros tryjob --help for available options.
     build_toolchain: builds and uses the latest toolchain, rather than the
                      prebuilt one in SDK.
@@ -158,7 +151,7 @@ def GetTrybotImage(chromeos_root,
     (8952271933586980528, trybot-elm-release-tryjob/R67-10480.0.0-b2373596)
   """
   buildbucket_id = SubmitTryjob(chromeos_root, buildbot_name, patch_list,
-                                build_tag, tryjob_flags, build_toolchain)
+                                tryjob_flags, build_toolchain)
   if async:
     return buildbucket_id, ' '
 
diff --git a/cros_utils/buildbot_utils_unittest.py b/cros_utils/buildbot_utils_unittest.py
index 5d3ae40d..c57b2d32 100755
--- a/cros_utils/buildbot_utils_unittest.py
+++ b/cros_utils/buildbot_utils_unittest.py
@@ -19,7 +19,7 @@ from cros_utils import command_executer
 class TrybotTest(unittest.TestCase):
   """Test for CommandExecuter class."""
 
-  tryjob_out = (
+  old_tryjob_out = (
       'Verifying patches...\n'
       'Submitting tryjob...\n'
       'Successfully sent PUT request to [buildbucket_bucket:master.chromiumos.t'
@@ -31,12 +31,16 @@ class TrybotTest(unittest.TestCase):
       'etId=8952721143823688176\n'
       '  https://uberchromegw.corp.google.com/i/chromiumos.tryserver/waterfall?'
       'committer=laszio@chromium.org&builder=etc\n')
+  tryjob_out = (
+      '[{"buildbucket_id": "8952721143823688176", "build_config": '
+      '"cave-llvm-toolchain-tryjob", "url": '
+      '"http://cros-goldeneye/chromeos/healthmonitoring/buildDetails?buildbucketId=8952721143823688176"}]'
+  )
 
   buildresult_out = (
       '{"8952721143823688176": {"status": "pass", "artifacts_url":'
       '"gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-'
-      'b20789"}}'
-  )
+      'b20789"}}')
 
   buildbucket_id = '8952721143823688176'
   counter_1 = 10
@@ -45,6 +49,7 @@ class TrybotTest(unittest.TestCase):
     with patch.object(buildbot_utils, 'SubmitTryjob') as mock_submit:
       with patch.object(buildbot_utils, 'PeekTrybotImage') as mock_peek:
         with patch.object(time, 'sleep', return_value=None):
+
           def peek(_chromeos_root, _buildbucket_id):
             self.counter_1 -= 1
             if self.counter_1 >= 0:
@@ -52,20 +57,20 @@ class TrybotTest(unittest.TestCase):
             return ('pass',
                     'gs://chromeos-image-archive/trybot-elm-release-tryjob/'
                     'R67-10468.0.0-b20789')
+
           mock_peek.side_effect = peek
           mock_submit.return_value = self.buildbucket_id
 
           # sync
           buildbucket_id, image = buildbot_utils.GetTrybotImage(
-              '/tmp', 'falco-release-tryjob', [], 'description')
+              '/tmp', 'falco-release-tryjob', [])
           self.assertEqual(buildbucket_id, self.buildbucket_id)
           self.assertEqual('trybot-elm-release-tryjob/'
-                           'R67-10468.0.0-b20789',
-                           image)
+                           'R67-10468.0.0-b20789', image)
 
           # async
           buildbucket_id, image = buildbot_utils.GetTrybotImage(
-              '/tmp', 'falco-release-tryjob', [], 'description', async=True)
+              '/tmp', 'falco-release-tryjob', [], async=True)
           self.assertEqual(buildbucket_id, self.buildbucket_id)
           self.assertEqual(' ', image)
 
@@ -84,9 +89,9 @@ class TrybotTest(unittest.TestCase):
       mocked_run.return_value = (0, self.buildresult_out, '')
       status, image = buildbot_utils.PeekTrybotImage('/', self.buildbucket_id)
       self.assertEqual('pass', status)
-      self.assertEqual('gs://chromeos-image-archive/trybot-elm-release-tryjob/'
-                       'R67-10468.0.0-b20789',
-                       image)
+      self.assertEqual(
+          'gs://chromeos-image-archive/trybot-elm-release-tryjob/'
+          'R67-10468.0.0-b20789', image)
 
       # running
       mocked_run.return_value = (1, '', '')
@@ -99,9 +104,9 @@ class TrybotTest(unittest.TestCase):
       mocked_run.return_value = (0, buildresult_fail, '')
       status, image = buildbot_utils.PeekTrybotImage('/', self.buildbucket_id)
       self.assertEqual('fail', status)
-      self.assertEqual('gs://chromeos-image-archive/trybot-elm-release-tryjob/'
-                       'R67-10468.0.0-b20789',
-                       image)
+      self.assertEqual(
+          'gs://chromeos-image-archive/trybot-elm-release-tryjob/'
+          'R67-10468.0.0-b20789', image)
 
   def testParseTryjobBuildbucketId(self):
     buildbucket_id = buildbot_utils.ParseTryjobBuildbucketId(self.tryjob_out)