From 502ad674f311e29085d8cef85ee0b6cfeb052d2e Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Thu, 13 Feb 2014 16:06:41 -0800
Subject: [PATCH] Revert requiring a recent positive check result

Revert "Enable zuul gerrit debug logging"

This reverts commit def03556bc36169e39c909471b0fedd5f5acfec2.

Revert "narrow the freshness window to 24h"

This reverts commit 20f5d2d0034641bc96e822c6846d3b5886dbe119.

Revert "Require a recent (48h) positive check result"

This reverts commit a78022f9d4bce9296b600dfb8992c1d4e063852e.

There is a bug that is causing the automatic gate enqueue after
a verify+1 to fail.  Revert this until we track it down.

Change-Id: I7347e2e999855e79177ec5f670392334c92d628d
---
 .../openstack_project/files/zuul/layout.yaml  | 19 +------------------
 .../openstack_project/files/zuul/logging.conf |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 3ccc9e3dfe..40cade2b35 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -16,12 +16,7 @@ pipelines:
         - event: comment-added
           require-approval:
             - username: jenkins
-              older-than: 72h
-        - event: comment-added
-          require-approval:
-            - approved: 1
-            - username: jenkins
-              older-than: 24h
+              older-than: 48h
     start:
       gerrit:
         verified: 0
@@ -40,22 +35,10 @@ pipelines:
     trigger:
       gerrit:
         - event: comment-added
-          require-approval:
-            - verified: 1
-              username: jenkins
-              newer-than: 24h
           approval:
             - approved: 1
-        - event: comment-added
-          approval:
-            - verified: 1
-              username: jenkins
         - event: comment-added
           comment_filter: (?i)^\s*reverify( (?:bug|lp)[\s#:]*(\d+))\s*$
-          require-approval:
-            - verified: 1
-              username: jenkins
-              newer-than: 24h
     start:
       gerrit:
         verified: 0
diff --git a/modules/openstack_project/files/zuul/logging.conf b/modules/openstack_project/files/zuul/logging.conf
index 04c33c6178..ec369851d7 100644
--- a/modules/openstack_project/files/zuul/logging.conf
+++ b/modules/openstack_project/files/zuul/logging.conf
@@ -17,7 +17,7 @@ handlers=debug,normal
 qualname=zuul
 
 [logger_gerrit]
-level=DEBUG
+level=INFO
 handlers=debug,normal
 qualname=gerrit