aboutsummaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2017-10-17 09:18:18 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-17 13:43:42 +0000
commitcff9f956c794954a67000792ab632c17026ececf (patch)
tree21840cc97c227cd482899517ea5cb8cb4757f0b6 /bin
parent7bbbf62d6ec14aea43e7dff7933bf9fb98575dca (diff)
bin/try: Add support for select Chromium trybots
These are hard-coded in update_meta_config.py, which is used to set the list of trybots in Gerrit. Bug: skia: Change-Id: I6e512e4cb59974e27e8954cf5134c70068e716f3 Reviewed-on: https://skia-review.googlesource.com/60521 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/try.py52
1 files changed, 35 insertions, 17 deletions
diff --git a/bin/try.py b/bin/try.py
index a5dc378255..24a0c25342 100755
--- a/bin/try.py
+++ b/bin/try.py
@@ -17,10 +17,15 @@ import subprocess
import sys
-BUCKET = 'skia.primary'
+BUCKET_SKIA_PRIMARY = 'skia.primary'
CHECKOUT_ROOT = os.path.realpath(os.path.join(
os.path.dirname(os.path.abspath(__file__)), os.pardir))
-JOBS_JSON = os.path.join(CHECKOUT_ROOT, 'infra', 'bots', 'jobs.json')
+INFRA_BOTS = os.path.join(CHECKOUT_ROOT, 'infra', 'bots')
+JOBS_JSON = os.path.join(INFRA_BOTS, 'jobs.json')
+
+sys.path.insert(0, INFRA_BOTS)
+
+import update_meta_config
def main():
@@ -33,19 +38,31 @@ def main():
help='Job name or regular expression to match job names.')
args = parser.parse_args()
- # Load and filter the list of jobs.
+ # Load and filter the list of Skia jobs.
+ jobs = []
with open(JOBS_JSON) as f:
- jobs = json.load(f)
+ jobs.append((BUCKET_SKIA_PRIMARY, json.load(f)))
+ jobs.extend(update_meta_config.CQ_INCLUDE_CHROMIUM_TRYBOTS)
if args.job:
- jobs = [j for j in jobs if re.search(args.job, j)]
+ new_jobs = []
+ for bucket, job_list in jobs:
+ filtered = [j for j in job_list if re.search(args.job, j)]
+ if len(filtered) > 0:
+ new_jobs.append((bucket, filtered))
+ jobs = new_jobs
# Display the list of jobs.
if len(jobs) == 0:
print 'Found no jobs matching "%s"' % repr(args.job)
sys.exit(1)
- print 'Found %d jobs:' % len(jobs)
- for j in jobs:
- print ' %s' % j
+ count = 0
+ for bucket, job_list in jobs:
+ count += len(job_list)
+ print 'Found %d jobs:' % count
+ for bucket, job_list in jobs:
+ print ' %s:' % bucket
+ for j in job_list:
+ print ' %s' % j
if args.list:
return
@@ -55,15 +72,16 @@ def main():
sys.exit(1)
# Trigger the try jobs.
- cmd = ['git', 'cl', 'try', '-B', BUCKET]
- for j in jobs:
- cmd.extend(['-b', j])
- try:
- subprocess.check_call(cmd)
- except subprocess.CalledProcessError:
- # Output from the command will fall through, so just exit here rather than
- # printing a stack trace.
- sys.exit(1)
+ for bucket, job_list in jobs:
+ cmd = ['git', 'cl', 'try', '-B', bucket]
+ for j in job_list:
+ cmd.extend(['-b', j])
+ try:
+ subprocess.check_call(cmd)
+ except subprocess.CalledProcessError:
+ # Output from the command will fall through, so just exit here rather than
+ # printing a stack trace.
+ sys.exit(1)
if __name__ == '__main__':