| Index: tools/bots/functional_testing.py
|
| ===================================================================
|
| --- tools/bots/functional_testing.py (revision 36878)
|
| +++ tools/bots/functional_testing.py (working copy)
|
| @@ -17,6 +17,7 @@
|
| import bot_utils
|
|
|
| FT_BUILDER = r'ft-slave-(linux|mac)'
|
| +FT_MASTER = r'ft-master'
|
|
|
| EDITOR_LOCATION='/home/chrome-bot/Desktop'
|
|
|
| @@ -27,9 +28,17 @@
|
| - system: always "linux" or "mac"
|
| """
|
| pattern = re.match(FT_BUILDER, name)
|
| - if not pattern:
|
| + master_pattern = re.match(FT_MASTER, name)
|
| + if not pattern and not master_pattern:
|
| return None
|
| - return bot.BuildInfo('none', 'none', 'release', pattern.group(1))
|
| + if master_pattern:
|
| + tag = 'master'
|
| + system = 'linux'
|
| + else:
|
| + tag = 'slave'
|
| + system = pattern.group(1)
|
| + return bot.BuildInfo('none', 'none', 'release', system,
|
| + builder_tag=tag)
|
|
|
| def Run(args):
|
| print "Running: %s" % ' '.join(args)
|
| @@ -37,6 +46,9 @@
|
| bot.RunProcess(args)
|
|
|
| def FTSteps(config):
|
| + if config.builder_tag == 'master':
|
| + print 'Not doing anything on master for now'
|
| + return
|
| revision = int(os.environ['BUILDBOT_GOT_REVISION'])
|
| bot_name, _ = bot.GetBotName()
|
| print bot_name
|
| @@ -56,4 +68,4 @@
|
| Run(['unzip', local_path, '-d', EDITOR_LOCATION])
|
|
|
| if __name__ == '__main__':
|
| - bot.RunBot(SrcConfig, FTSteps)
|
| + bot.RunBot(SrcConfig, FTSteps)
|
|
|