From bbb934b89b18ae9b9d0555f1fa98ed7f154e177b Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Wed, 16 Jul 2014 11:34:18 +0300
Subject: [PATCH] Add rally-dsvm jobs to gate pipeline in rally

These jobs are stable enough to be in gate pipepine. Also renamed
check-rally-dvsm to gate-rally-dsvm.

Change-Id: I86e3f9ee5d7f97998ac1fa2517c1e031cb71c6fa
---
 .../jenkins_job_builder/config/rally.yaml     | 10 +++----
 .../openstack_project/files/zuul/layout.yaml  | 26 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

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 25bd87426c..d05455d440 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -59,7 +59,7 @@
 
 
 - job-template:
-    name: 'check-rally-dsvm-{name}'
+    name: 'gate-rally-dsvm-{name}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -79,7 +79,7 @@
 
 
 - job-template:
-    name: 'check-rally-dsvm-neutron-{name}'
+    name: 'gate-rally-dsvm-neutron-{name}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -99,7 +99,7 @@
 
 
 - job:
-    name: 'check-rally-dsvm-cli'
+    name: 'gate-rally-dsvm-cli'
     node: 'devstack-precise || devstack-trusty'
 
     builders:
@@ -139,5 +139,5 @@
 - job-group:
     name: rally-jobs
     jobs:
-      - 'check-rally-dsvm-{name}'
-      - 'check-rally-dsvm-neutron-{name}'
+      - 'gate-rally-dsvm-{name}'
+      - 'gate-rally-dsvm-neutron-{name}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 8675df5c37..0d9f345574 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -442,7 +442,7 @@ jobs:
     branch: ^master.*$
   - name: gate-tempest-dsvm-full
     queue-name: integrated
-  - name: check-rally-dsvm-neutron-neutron
+  - name: gate-rally-dsvm-neutron-neutron
     voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-full$
     voting: false
@@ -514,7 +514,7 @@ jobs:
     voting: false
   - name: gate-cinder-pylint
     voting: false
-  - name: check-rally-dsvm-cinder
+  - name: gate-rally-dsvm-cinder
     voting: false
   - name: dev-zuul-coverage
     voting: false
@@ -575,10 +575,10 @@ jobs:
   - name: gate-keystone-python33
     branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
-  - name: check-rally-dsvm-keystone
+  - name: gate-rally-dsvm-keystone
     branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
-  - name: check-rally-dsvm-glance
+  - name: gate-rally-dsvm-glance
     voting: false
   - name: gate-python-neutronclient-python33
     voting: false
@@ -674,7 +674,7 @@ jobs:
     voting: false
   - name: gate-tomograph-python33
     voting: false
-  - name: check-rally-dsvm-cli
+  - name: gate-rally-dsvm-cli
     voting: false
   - name: gate-stevedore-docs
     voting: false
@@ -771,7 +771,7 @@ projects:
     check:
       - gate-cinder-pylint
       - check-devstack-dsvm-cells
-      - check-rally-dsvm-cinder
+      - gate-rally-dsvm-cinder
     gate:
       - gate-devstack-dsvm-cells
     experimental:
@@ -866,7 +866,7 @@ projects:
       - check-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-rally-dsvm-glance
+      - gate-rally-dsvm-glance
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
@@ -989,7 +989,7 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
-      - check-rally-dsvm-keystone
+      - gate-rally-dsvm-keystone
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
@@ -1061,7 +1061,7 @@ projects:
       - name: translation-jobs
     check:
       - check-neutron-dsvm-functional
-      - check-rally-dsvm-neutron-neutron
+      - gate-rally-dsvm-neutron-neutron
       - check-tempest-dsvm-neutron-2
       - check-tempest-dsvm-neutron-pg-2
     gate:
@@ -4535,15 +4535,17 @@ projects:
       - gate-rally-python27
       - gate-rally-install-bare-centos6
       - gate-rally-install-bare-precise
-      - check-rally-dsvm-rally
-      - check-rally-dsvm-neutron-rally
-      - check-rally-dsvm-cli
+      - gate-rally-dsvm-rally
+      - gate-rally-dsvm-neutron-rally
+      - gate-rally-dsvm-cli
     gate:
       - gate-rally-pep8
       - gate-rally-python26
       - gate-rally-python27
       - gate-rally-install-bare-centos6
       - gate-rally-install-bare-precise
+      - gate-rally-dsvm-rally
+      - gate-rally-dsvm-neutron-rally
     post:
       - rally-branch-tarball
       - rally-coverage