From cbd220df931eae5649f92f768c504b79576e6d8b Mon Sep 17 00:00:00 2001
From: Noam Bloom <noam.bloom.ext@nokia.com>
Date: Tue, 19 Apr 2016 11:24:14 +0300
Subject: [PATCH] Vitrage - Zuul/Jenkins fix

layout.yaml - Removed Python3 jobs temporarily until
     we set our local tox to run py34 instead of py3.
vitrage.yaml - Fixed hook function to use source

URGENT - Thanks :)

Change-Id: I58994cf77608df5310d6a2b45de195dcc718cfe2
---
 jenkins/jobs/vitrage.yaml | 9 +++------
 zuul/layout.yaml          | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/vitrage.yaml b/jenkins/jobs/vitrage.yaml
index 7341af0841..8f5665c858 100644
--- a/jenkins/jobs/vitrage.yaml
+++ b/jenkins/jobs/vitrage.yaml
@@ -22,20 +22,17 @@
           export DEVSTACK_LOCAL_CONFIG="enable_plugin vitrage git://git.openstack.org/openstack/vitrage"
 
           function pre_test_hook {{
-              cd $BASE/new/vitrage/devstack
-              ./pre_test_hook.sh
+              source $BASE/new/vitrage/devstack/pre_test_hook.sh
           }}
           export -f pre_test_hook
 
           function gate_hook {{
-              cd $BASE/new/vitrage/devstack
-              ./gate_hook.sh
+              source $BASE/new/vitrage/devstack/gate_hook.sh
           }}
           export -f gate_hook
 
           function post_test_hook {{
-              cd $BASE/new/vitrage/devstack
-              ./post_test_hook.sh
+              source $BASE/new/vitrage/devstack/post_test_hook.sh
           }}
           export -f post_test_hook
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d1409924ea..1ea3f933dd 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10249,7 +10249,6 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
-      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi
 
@@ -11689,7 +11688,6 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
-      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi
     experimental:
@@ -11699,7 +11697,6 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
-      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi