commit 55dd0461a0f33061232bab780aef9e51bb518dfb
author Benny Peake <bpeake@google.com> Thu Jun 29 17:58:40 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Jun 30 14:24:27 2017 -0700
tree bc871ec6d1799282b052343c1b57fa86dc197fe1
parent 7ae68aec08804d7dce326af1be28b49bc9a0f60c

Adds ignore for re-mapping when overriding build url

If the overide_build_url flag is present then mapping
will not be applied.

BUG=None
TEST=None

Change-Id: I21b937f1f80a4ca1d611ad701f1af4b0f4a39e05
Reviewed-on: https://chromium-review.googlesource.com/557402
Commit-Ready: Kris Rambish <krisr@chromium.org>
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>

server/site_tests/android_ACTS/android_ACTS.py

diff --git a/server/site_tests/android_ACTS/android_ACTS.py b/server/site_tests/android_ACTS/android_ACTS.py
index 18252b8..b4d615b 100644
--- a/server/site_tests/android_ACTS/android_ACTS.py
+++ b/server/site_tests/android_ACTS/android_ACTS.py
@@ -151,18 +151,19 @@
             job_build_id = job_build_info['build_id']
 
 
-        if job_build_branch in branch_mappings:
-            logging.info('Replacing branch %s -> %s',
-                         job_build_branch,
-                         branch_mappings[job_build_branch].strip())
-            job_build_branch = branch_mappings[job_build_branch].strip()
-            job_build_id = "LATEST"
-        elif job_build_branch in self.aliases_map:
-            logging.info('Replacing branch %s -> %s',
-                         job_build_branch,
-                         self.aliases_map[job_build_branch][0].strip())
-            job_build_branch = self.aliases_map[job_build_branch][0].strip()
-            job_build_id = "LATEST"
+        if not override_build_url:
+            if job_build_branch in branch_mappings:
+                logging.info('Replacing branch %s -> %s',
+                             job_build_branch,
+                             branch_mappings[job_build_branch].strip())
+                job_build_branch = branch_mappings[job_build_branch].strip()
+                job_build_id = "LATEST"
+            elif job_build_branch in self.aliases_map:
+                logging.info('Replacing branch %s -> %s',
+                             job_build_branch,
+                             self.aliases_map[job_build_branch][0].strip())
+                job_build_branch = self.aliases_map[job_build_branch][0].strip()
+                job_build_id = "LATEST"
 
         build_name = '%s/%s/%s' % (job_build_branch,
                                    job_build_target,