From c31f5171ea946a8d96b279f14d440768f7a47262 Mon Sep 17 00:00:00 2001
From: Denis Egorenko <degorenko@mirantis.com>
Date: Mon, 16 Jun 2014 18:33:38 +0400
Subject: [PATCH] Fix gate-savanna-pep8-trunk job

* add missing dependency
* set job non voting

Change-Id: Ideea29bd423546e0ad4b36d4c5e92b6132d88e69
---
 config/nodepool/scripts/prepare_node.sh  | 3 +++
 config/zuul/layout.yaml                  | 4 ++++
 slave-scripts/gate-savanna-pep8-trunk.sh | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/nodepool/scripts/prepare_node.sh b/config/nodepool/scripts/prepare_node.sh
index f9cbcfca..d055eb8e 100755
--- a/config/nodepool/scripts/prepare_node.sh
+++ b/config/nodepool/scripts/prepare_node.sh
@@ -56,6 +56,9 @@ sudo pip install mysql-python
 cd /tmp && git clone https://github.com/openstack/sahara
 cd sahara && sudo pip install -U -r requirements.txt
 
+# pep8-trunk job requirements
+sudo apt-get install gettext -y
+
 sudo su - jenkins -c "echo '
 JENKINS_PUBLIC_KEY' >> /home/jenkins/.ssh/authorized_keys"
 sync
diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index 520daaa0..fdccc2d0 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -40,6 +40,7 @@ projects:
       - gate-sahara-integration-hdp1
       - gate-sahara-integration-hdp2
       - gate-sahara-integration-transient
+      - gate-savanna-pep8-trunk
 
   - name: openstack/python-saharaclient
     check:
@@ -49,6 +50,7 @@ projects:
       - gate-saharaclient-integration-hdp1
       - gate-saharaclient-integration-hdp2
       - gate-saharaclient-integration-transient
+      - gate-savanna-pep8-trunk
 
   - name: openstack/sahara-dashboard
     check:
@@ -76,3 +78,5 @@ jobs:
     branch: ^(master|milestone-proposed|stable/icehouse)$
   - name: diskimage-integration-hdp2
     voting: false
+  - name: gate-savanna-pep8-trunk
+    voting: false
diff --git a/slave-scripts/gate-savanna-pep8-trunk.sh b/slave-scripts/gate-savanna-pep8-trunk.sh
index 6480e9a2..89fe4e35 100644
--- a/slave-scripts/gate-savanna-pep8-trunk.sh
+++ b/slave-scripts/gate-savanna-pep8-trunk.sh
@@ -8,5 +8,6 @@ set -o pipefail
 sed -i '/^hacking/d' test-requirements.txt
 echo -e "-f http://tarballs.openstack.org/hacking/hacking-master.tar.gz#egg=hacking-master\nhacking==master\n$(cat test-requirements.txt)" > test-requirements.txt
 
+sed -i '/^ignore/d' tox.ini
+
 tox -v -epep8 -- --statistics | tee pep8.txt
-set +o pipefail