From b14937df8138e1365fc44bd0bc457b056eb82376 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 13 Aug 2016 09:17:55 +0800
Subject: [PATCH] Make the kolla-kubernetes relate jobs non-voting

Jobs in kolla-kubernates become vote by mistake in patch set
Id8e43d7e36f0ecf691fb1abe802823ca6ab84091. This patch fix
the that by adding '-nv' in the suffix of the jobs.

Change-Id: Ided6ddce2bacc9101130b26ea1432b3e38b6ee9c
---
 jenkins/jobs/kolla-kubernetes.yaml |  2 +-
 jenkins/jobs/projects.yaml         | 16 +++++++---------
 zuul/layout.yaml                   |  6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/jenkins/jobs/kolla-kubernetes.yaml b/jenkins/jobs/kolla-kubernetes.yaml
index 616cc82b88..38733a2fee 100644
--- a/jenkins/jobs/kolla-kubernetes.yaml
+++ b/jenkins/jobs/kolla-kubernetes.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}'
+    name: '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 75d9279231..40f5f29fd7 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3816,24 +3816,22 @@
       - pypi-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}{job-suffix}':
           action: deploy
           distro: centos
           node: 'centos-7'
           pipeline: gate
-          type: binary
-      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
-          action: deploy
-          distro: centos
-          node: 'centos-7'
-          pipeline: gate
-          type: source
-      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
+          type:
+            - binary
+            - source
+          job-suffix: '-nv'
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}{job-suffix}':
           action: deploy
           distro: ubuntu
           node: ubuntu-trusty
           pipeline: gate
           type: source
+          job-suffix: '-nv'
 
 - project:
     name: kosmos
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3f0096d25a..a7d8b3df03 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8266,9 +8266,9 @@ projects:
       - name: publish-to-pypi
       - name: release-notes-jobs
     check:
-      - gate-kolla-kubernetes-deploy-centos-binary
-      - gate-kolla-kubernetes-deploy-centos-source
-      - gate-kolla-kubernetes-deploy-ubuntu-source
+      - gate-kolla-kubernetes-deploy-centos-binary-nv
+      - gate-kolla-kubernetes-deploy-centos-source-nv
+      - gate-kolla-kubernetes-deploy-ubuntu-source-nv
 
   - name: openstack/kosmos
     template: