From 3c7e95c3bd08bed2f345499ea29917e229ac9789 Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Thu, 17 Apr 2014 15:21:07 +0300
Subject: [PATCH] Add rally-jobs job group

This group contains job which run specified rally scenario against
devstack cloud.

Also add this group to rally project with `rally' scenario to self-check.

Change-Id: Ia9dc6450668a65a07e067b680bf0482c2f8c4198
---
 .../jenkins_job_builder/config/projects.yaml  |  4 +--
 .../jenkins_job_builder/config/rally.yaml     | 27 ++++++++++++++++---
 .../openstack_project/files/zuul/layout.yaml  |  4 +--
 3 files changed, 26 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 9c099c06cc..20c5e1a25c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2052,13 +2052,11 @@
 
     jobs:
       - python-jobs
+      - rally-jobs
       - check-rally-install-{node}:
           node: bare-precise
       - check-rally-install-{node}:
           node: bare-centos6
-      - '{pipeline}-rally-scenarios':
-          pipeline: check
-          node: 'devstack-precise || devstack-precise-check'
 
 - project:
     name: python-rallyclient
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 24c8841810..796331ab34 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -10,25 +10,44 @@
     publishers:
       - console-log
 
-- job-template:
-    name: '{pipeline}-rally-scenarios'
-    node: '{node}'
 
+- builder:
+    name: devstack-rally-gate
     builders:
       - link-logs
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
           export PROJECTS="stackforge/rally $PROJECTS"
+          export ENABLED_SERVICES=rally
+          export DEVSTACK_GATE_EXERCISES=1
+          export RUN_EXERCISES=rally
+          export RALLY_SCENARIO={scenario}
 
           function pre_test_hook {{
-              . /opt/stack/new/rally/tests_ci/pre_test_hook.sh
+              # Install rally-devstack integration
+              cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack
           }}
           export -f pre_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
+
+- job-template:
+    name: 'check-rally-dsvm-{name}'
+    node: 'devstack-precise || devstack-precise-check'
+
+    builders:
+      - devstack-rally-gate:
+          scenario: '{name}'
+
     publishers:
       - devstack-logs
       - console-log
+
+
+- job-group:
+    name: rally-jobs
+    jobs:
+      - 'check-rally-dsvm-{name}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6799016b4f..7c0c48394d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -557,7 +557,7 @@ jobs:
     voting: false
   - name: ^check-rally-install-.*$
     voting: false
-  - name: check-rally-scenarios
+  - name: check-rally-dsvm-rally
     voting: false
   - name: gate-rally-python33
     voting: false
@@ -4358,7 +4358,7 @@ projects:
       - gate-rally-python33
       - check-rally-install-bare-centos6
       - check-rally-install-bare-precise
-      - check-rally-scenarios
+      - check-rally-dsvm-rally
     gate:
       - gate-rally-pep8
       - gate-rally-python26