From 11657487663a2cc77506616cfd728b5d0da4c4bb Mon Sep 17 00:00:00 2001
From: Timur Sufiev <tsufiev@mirantis.com>
Date: Tue, 5 Jan 2016 00:48:47 +0300
Subject: [PATCH] Use scripts from horizon repo in integration job test hooks

Change-Id: If73cf6fc32ff567d0232982411c4fb436c0d2b55
Depends-On: Ic2d60df846e876530662046d75c3e56e7841ba30
---
 jenkins/jobs/horizon.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml
index abfa1b9e95..4b8ab8c498 100644
--- a/jenkins/jobs/horizon.yaml
+++ b/jenkins/jobs/horizon.yaml
@@ -35,17 +35,18 @@
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export DEVSTACK_GATE_NEUTRON=1
 
+          function pre_test_hook {
+              cd /opt/stack/new/horizon/tools/gate/integration
+              ./pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
           function post_test_hook {
-              local retval
-              cd /opt/stack/new/horizon
-              sudo -H -u stack tox -e py27integration
-              retval=$?
-              if [ -d openstack_dashboard/test/integration_tests/integration_tests_screenshots/ ]; then
-                cp -r openstack_dashboard/test/integration_tests/integration_tests_screenshots/ /home/jenkins/workspace/gate-horizon-dsvm-integration/
-              fi
-              return $retval
+              cd /opt/stack/new/horizon/tools/gate/integration
+              ./post_test_hook.sh
           }
           export -f post_test_hook
+
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh