]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Flip logic of checking whether a branch can report
authorZack Cerza <zack@cerza.org>
Mon, 24 Feb 2014 17:20:03 +0000 (11:20 -0600)
committerZack Cerza <zack@cerza.org>
Mon, 24 Feb 2014 21:01:58 +0000 (15:01 -0600)
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 <zack.cerza@inktank.com>
teuthology/queue.py

index 9a3e6f5a85cee994ea5316051758fd0236130db2..725240eb1258ee2a9eb0596f38a6587d1d5db33b 100644 (file)
@@ -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.