commit 1a6709bf61e4a811ffe5ed0f1ffa3d0d80ccce09
author Keith Haddow <haddowk@chromium.org> Tue Oct 08 13:57:40 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Sat Oct 12 01:33:53 2019 -0700
tree 8a12cc73a540cfdeee162403471f080769641e2b
parent 136db992a2478866f3d412b20c68063a7feace63

[gs_offloader]  Fix for the change in the swarming filepath.

BUG=chromium:1012431
TEST=unit test

Change-Id: I6ba73e687cc97fefcf75373a4a5c36e8b6e4d442
Reviewed-on: https://chromium-review.googlesource.com/1848431
Tested-by: Keith Haddow <haddowk@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Jason Kusuma <jkusuma@google.com>

site_utils/gs_offloader.py

diff --git a/site_utils/gs_offloader.py b/site_utils/gs_offloader.py
index c43f0c9..b104e89 100755
--- a/site_utils/gs_offloader.py
+++ b/site_utils/gs_offloader.py
@@ -498,15 +498,11 @@
     # cheets_CTS.android.dpi/results/cts-results/2016.04.28_01.41.44
 
     # Swarming paths look like:
-    # /swarming-458e3a3a7fc6f210/1/autoserv_test/
+    # /swarming-458e3a3a7fc6f210/autoserv_test/
     # cheets_CTS.android.dpi/results/cts-results/2016.04.28_01.41.44
 
     folders = path.split(os.sep)
-    if 'swarming' in folders[1]:
-        # Swarming job and attempt combined
-        job_id = "%s-%s" % (folders[-7], folders[-6])
-    else:
-        job_id = folders[-6]
+    job_id = folders[-6]
 
     cts_package = folders[-4]
     timestamp = folders[-1]

site_utils/gs_offloader_unittest.py

diff --git a/site_utils/gs_offloader_unittest.py b/site_utils/gs_offloader_unittest.py
index 598fb80..ad564f0 100755
--- a/site_utils/gs_offloader_unittest.py
+++ b/site_utils/gs_offloader_unittest.py
@@ -927,12 +927,12 @@
 
 
         # A skylab path
-        path = ('/swarming-458e3a3a7fc6f210/1/autoserv_test/'
+        path = ('/swarming-458e3a3a7fc6f210/autoserv_test/'
                 'cheets_CTS.android.dpi/results/cts-results/'
                 '2016.04.28_01.41.44')
         job_id, package, timestamp = \
             gs_offloader._parse_cts_job_results_file_path(path)
-        self.assertEqual('swarming-458e3a3a7fc6f210-1', job_id)
+        self.assertEqual('swarming-458e3a3a7fc6f210', job_id)
         self.assertEqual('cheets_CTS.android.dpi', package)
         self.assertEqual('2016.04.28_01.41.44', timestamp)