From b288150f79330c5f497c76b685414cf1629ae75c Mon Sep 17 00:00:00 2001
From: Liping Mao <limao@cisco.com>
Date: Mon, 25 Jul 2016 13:09:34 +0800
Subject: [PATCH] enable python34 and python35 voting in kuryr and
 kuryr-libnetwork

This patch enable py34 and py35 voting in kuryr and kuryr-libnetwork.
This is the action item of last kuryr meeting.

Meeting log is here:
http://eavesdrop.openstack.org/meetings/kuryr/2016/kuryr.2016-07-18-14.05.html

Change-Id: I1d431097055436c0904aa0df5e41ddad489dbc9e
---
 jenkins/jobs/projects.yaml |  4 ++--
 zuul/layout.yaml           | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 3179feee43..51a5905660 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3740,7 +3740,7 @@
     jobs:
       - python-jobs
       - 'gate-{name}-python35{suffix}':
-          suffix: '-nv'
+          suffix: ''
       - openstack-publish-jobs
       - pypi-jobs
 
@@ -3764,7 +3764,7 @@
     jobs:
       - python-jobs
       - 'gate-{name}-python35{suffix}':
-          suffix: '-nv'
+          suffix: ''
       - openstack-publish-jobs
       - pypi-jobs
       - '{pipeline}-install-dsvm-kuryr{job-suffix}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5c48c76d9b..8668defc77 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2773,9 +2773,6 @@ jobs:
   - name: gate-murano-agent-python34
     branch: ^(?!stable/(?:liberty|mitaka)).*$
 
-  - name: gate-kuryr-python34
-    voting: false
-
   - name: gate-networking-nec-python34
     branch: ^(?!stable/liberty).*$
 
@@ -7810,12 +7807,11 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
-      - name: python35-jobs-nv
+      - name: python34-jobs
+      - name: python35-jobs
       - name: publish-to-pypi
       - name: openstack-server-publish-jobs
       - name: check-requirements
-    check:
-      - gate-kuryr-python34
 
   - name: openstack/kuryr-kubernetes
     template:
@@ -7830,7 +7826,8 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
-      - name: python35-jobs-nv
+      - name: python34-jobs
+      - name: python35-jobs
       - name: publish-to-pypi
       - name: openstack-server-publish-jobs
       - name: check-requirements
@@ -7838,7 +7835,6 @@ projects:
       - gate-install-dsvm-kuryr-nv
       - gate-kuryr-dsvm-fullstack-nv
       - gate-kuryr-dsvm-rally-nv
-      - gate-kuryr-libnetwork-python34
 
   - name: openstack/kwapi
     template: