Bug 739486 - test-masters.sh should run ./setup_master.py -t r=catlee
authorJohn Ford <jhford@mozilla.com>
Wed, 28 Mar 2012 09:01:45 -0700
changeset 5698 99c49b20bc91aa7f562dd9310fb7696072643d68
parent 5697 40b64f4b4bb304e1cf05902712f2aff29a9faf58
child 5699 7edb96f041dabbeec153b38f29725565f07137a7
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewerscatlee
bugs739486
Bug 739486 - test-masters.sh should run ./setup_master.py -t r=catlee
test-masters.sh
--- a/test-masters.sh
+++ b/test-masters.sh
@@ -1,54 +1,4 @@
 #!/bin/bash
-#
-# Script:
-#   test-masters.sh
-#
-# Purpose:
-#   This script will make sure that any changes on buildbot-configs
-#   are valid. The script will call setup-master.py for each master
-#   to make sure that they will be able to run 'buildbot checkconfig'.
-#   This script defaults to checking 0.7.x masters, and will test
-#   0.8.x masters when the -8 switch is passed.
-#
-# Requirements:
-#   You have to have buildbot installed.
-#   Include buildbotcustom and tools/lib/python in your PYTHONPATH.
-#
-# Author:
-#   Chris AtLee <catlee@mozilla.com>
-#
-set -e
-if [ -n "$TEMP" ]; then
-    master_dir=$TEMP/master_dir
-else
-    master_dir=master_dir
-fi
-# $extra_args determines if you will iterate through the 0.8.x
-# based masters or the 0.7.x ones
-if [ "$1" = "-7" ]; then
-    extra_args=-7
-
-# Any other arg will be treated as a json file to load
-elif [ -n "$1" ]; then
-    extra_args="-j $1"
-fi
-
-exit_code=0
-
-# Also test the simpler masters
-for master_name in simple-talos; do
-    echo -n "${master_name}... "
-    (cd $master_name; buildbot checkconfig > /dev/null && echo OK)
-done
-# It will iterate through list of masters and checkconfig for each one of them
-for master_name in $(python setup-master.py $extra_args --list); do
-    rm -rf $master_dir
-    mkdir $master_dir
-    echo -n "${master_name}... "
-    python setup-master.py $extra_args $master_dir $master_name
-    (cd $master_dir; buildbot checkconfig > /dev/null && echo OK) || \
-        { echo "Broken pieces are in $master_dir"; exit_code=1; false; }
-    rm -rf $master_dir
-done
-
-exit $exit_code
+# This script has been rewritten in setup_master.py using
+# the -t option.  We use that now
+./setup_master.py -t