Touchup android trybot annotator scripts

- Adding FYI trybot scripts to mirror fyi steps

BUG=147462

Review URL: https://chromiumcodereview.appspot.com/10933040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156582 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 18 insertions, 13 deletions

diff --git a/build/android/buildbot/bb_fyi_builder.sh b/build/android/buildbot/bb_fyi_builder.sh
index 3acc3b0..83c44fe 100755
--- a/build/android/buildbot/bb_fyi_builder.sh
+++ b/build/android/buildbot/bb_fyi_builder.sh
@@ -3,11 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Buildbot annotator script for the FYI waterfall builder.
-# Compiler and zip the build.
-
-# SHERIFF: there should be no need to disable this bot.
-# The FYI waterfall does not close the tree.
+# Buildbot annotator script for the fyi waterfall and fyi trybots.
+# Compile and zip the build.
 
 BB_DIR="$(dirname $0)"
 BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
diff --git a/build/android/buildbot/bb_fyi_tester.sh b/build/android/buildbot/bb_fyi_tester.sh
index c96721a..3c92cb8 100755
--- a/build/android/buildbot/bb_fyi_tester.sh
+++ b/build/android/buildbot/bb_fyi_tester.sh
@@ -3,12 +3,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Buildbot annotator script for a FYI waterfall tester.
+# Buildbot annotator script for the fyi waterfall and fyi trybots.
 # Downloads and extracts a build from the builder and runs tests.
 
-# SHERIFF: there should be no need to disable this bot.
-# The FYI waterfall does not close the tree.
-
 BB_DIR="$(dirname $0)"
 BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
 . "$BB_DIR/buildbot_functions.sh"
diff --git a/build/android/buildbot/bb_try_builder.sh b/build/android/buildbot/bb_try_builder.sh
index 1891992..18ca2a1 100755
--- a/build/android/buildbot/bb_try_builder.sh
+++ b/build/android/buildbot/bb_try_builder.sh
@@ -9,12 +9,11 @@ BB_DIR="$(dirname $0)"
 BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
 . "$BB_DIR/buildbot_functions.sh"
 
-# SHERIFF: if you need to quickly turn "android" trybots green,
+# SHERIFF: if you need to quickly turn "android_dbg" trybots green,
 # uncomment the next line (and send appropriate email out):
 ## bb_force_bot_green_and_exit
 # You will also need to change buildbot_try_tester.sh
 
 bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_check_webview_licenses
 bb_compile
 bb_zip_build
diff --git a/build/android/buildbot/bb_try_fyi_builder.sh b/build/android/buildbot/bb_try_fyi_builder.sh
new file mode 100755
index 0000000..3041ccc
--- /dev/null
+++ b/build/android/buildbot/bb_try_fyi_builder.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Buildbot annotator entry for trybot mirroring fyi builder
+exec "$(dirname $0)/bb_fyi_builder.sh" "$@"
diff --git a/build/android/buildbot/bb_try_fyi_tester.sh b/build/android/buildbot/bb_try_fyi_tester.sh
new file mode 100755
index 0000000..f3ea8e0
--- /dev/null
+++ b/build/android/buildbot/bb_try_fyi_tester.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Buildbot annotator entry for trybot mirroring fyi tester
+exec "$(dirname $0)/bb_fyi_tester.sh" "$@"
diff --git a/build/android/buildbot/bb_try_tester.sh b/build/android/buildbot/bb_try_tester.sh
index caba32d..bf8040f 100755
--- a/build/android/buildbot/bb_try_tester.sh
+++ b/build/android/buildbot/bb_try_tester.sh
@@ -12,10 +12,8 @@ BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
 # SHERIFF: if you need to quickly turn "android" trybots green,
 # uncomment the next line (and send appropriate email out):
 ## bb_force_bot_green_and_exit
-# You will also need to change buildbot_try_builder.sh
 
 bb_baseline_setup "$BB_SRC_ROOT" "$@"
 bb_extract_build
 bb_reboot_phones
 bb_run_unit_tests
-bb_run_instrumentation_tests