From 16fd1efe8dd759c3bc6eac7dc4cfeb41411ffe4b Mon Sep 17 00:00:00 2001
From: Alexis Lee <alexisl@hp.com>
Date: Thu, 16 Jan 2014 10:12:05 +0000
Subject: [PATCH] Augment the e-r query for bug 1258682

Work done to retain logs has changed the signature of this bug, see
comments #26 + #27 on:
    https://bugs.launchpad.net/tempest/+bug/1258682

Change-Id: Ia0813e64465ee59f351f0ee212681ab2fd256797
Related-Bug: #1258682
---
 queries/1258682.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/1258682.yaml b/queries/1258682.yaml
index 00dcdcd4..fd1ef252 100644
--- a/queries/1258682.yaml
+++ b/queries/1258682.yaml
@@ -1,4 +1,7 @@
 query: >
-  message:"Build timed out (after" AND
-  message:"minutes). Marking the build as failed." AND
-  filename:"console.html"
+  ((message:"Build timed out (after" AND
+    message:"minutes). Marking the build as failed.")
+   OR
+   (message:"./safe-devstack-vm-gate-wrap.sh: line" AND
+    message:"Killed timeout -s 9 ${DEVSTACK_GATE_TIMEOUT}m $BASE/new/devstack-gate/devstack-vm-gate.sh"))
+  AND filename:"console.html"