From 91bf8a813de708c637dc19dbc8f2f41266d258db Mon Sep 17 00:00:00 2001
From: Evgeny Sikachev <esikachev@mirantis.com>
Date: Thu, 23 Jun 2016 15:28:45 +0300
Subject: [PATCH] Added pre_hook for sahara cli tests

Added call for pre_test_hook method and fixed filter for
local debugging

Change-Id: Iee81d2e6202db3164b9a70e3d388218f49858f7a
---
 jenkins/jobs/sahara.yaml | 6 ++++++
 zuul/layout.yaml         | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 4259bff1d9..f14ae91480 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -150,10 +150,16 @@
               export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
           fi
 
+          function pre_test_hook {
+              cd /opt/stack/new/sahara-tests/tools/gate/cli_tests
+              ./pre_test_hook.sh
+          }
+
           function post_test_hook {
               cd /opt/stack/new/sahara-tests/tools/gate/cli_tests
               ./post_test_hook.sh
           }
+
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 94c107f4da..3d818c7116 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2924,7 +2924,6 @@ jobs:
           - ^etc/.*$
           - ^sahara_tests/.*$
           - ^sahara_tempest_plugin/.*$
-          - ^tools/.*$
           - ^tox.ini$
 
   # Only run the unit cross tests for cliff against master.