From: Zack Cerza Date: Mon, 24 Feb 2014 17:20:03 +0000 (-0600) Subject: Flip logic of checking whether a branch can report X-Git-Tag: 1.1.0~1642 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38cead630beea9df32f6e519171240956c76bbe9;p=teuthology.git Flip logic of checking whether a branch can report Previously we checked if the branch being used was in a whitelist of branches known to contain the reporting feature. Now, switch to checking against a blacklist of branches known to *not* have the feature: argonaut, bobtail, cuttlefish and dumpling. Signed-off-by: Zack Cerza --- diff --git a/teuthology/queue.py b/teuthology/queue.py index 9a3e6f5a8..725240eb1 100644 --- a/teuthology/queue.py +++ b/teuthology/queue.py @@ -236,8 +236,8 @@ def run_with_watchdog(process, job_config): time.sleep(teuth_config.watchdog_interval) # The job finished. Let's make sure paddles knows. - branches_with_reporting = ('master', 'next', 'last', 'emperor') - if job_config.get('teuthology_branch') not in branches_with_reporting: + branches_sans_reporting = ('argonaut', 'bobtail', 'cuttlefish', 'dumpling') + if job_config.get('teuthology_branch') in branches_sans_reporting: # The job ran with a teuthology branch that may not have the reporting # feature. Let's call teuthology-report (which will be from the master # branch) to report the job manually.