From 824127b910dcedb51e9680d74e0b4f6f1196e8fa Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Wed, 28 May 2014 10:12:16 +0300
Subject: [PATCH] Make rally-install and rally-dsvm jobs voting

Also add rally-install to gate pipeline

Change-Id: Ibf6bfc0bb33b17eaa19f108cf3dff26c56c34e05
---
 .../files/jenkins_job_builder/config/projects.yaml     |  4 ++--
 .../files/jenkins_job_builder/config/rally.yaml        |  2 +-
 modules/openstack_project/files/zuul/layout.yaml       | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 07afdb1f80..1b5b460307 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2189,9 +2189,9 @@
     jobs:
       - python-jobs
       - rally-jobs
-      - check-rally-install-{node}:
+      - gate-rally-install-{node}:
           node: bare-precise
-      - check-rally-install-{node}:
+      - gate-rally-install-{node}:
           node: bare-centos6
       - 'check-rally-cli':
           node: 'devstack-precise || devstack-precise-check'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
index 264825bffb..f87fbfc08d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'check-rally-install-{node}'
+    name: 'gate-rally-install-{node}'
     node: '{node}'
 
     builders:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 678e6b9846..7804a5712c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -589,10 +589,6 @@ jobs:
     voting: false
   - name: gate-tomograph-python33
     voting: false
-  - name: ^check-rally-install-.*$
-    voting: false
-  - name: check-rally-dsvm-rally
-    voting: false
   - name: check-rally-cli
     voting: false
   - name: gate-rally-python33
@@ -4672,14 +4668,16 @@ projects:
       - gate-rally-python26
       - gate-rally-python27
       - gate-rally-python33
-      - check-rally-install-bare-centos6
-      - check-rally-install-bare-precise
+      - gate-rally-install-bare-centos6
+      - gate-rally-install-bare-precise
       - check-rally-dsvm-rally
       - check-rally-cli
     gate:
       - gate-rally-pep8
       - gate-rally-python26
       - gate-rally-python27
+      - gate-rally-install-bare-centos6
+      - gate-rally-install-bare-precise
     post:
       - rally-branch-tarball
     pre-release: