From 446798639bad6b680381cd9361344d784527a49b Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Mon, 2 Jun 2014 16:24:40 +0300
Subject: [PATCH] Add rally-dsvm-netron job to rally job group

This job checks rally scenario on devstack node with neutron

Change-Id: Ie0a253c1707c819375d0f7ffb3f62e04f4eb56b1
---
 .../jenkins_job_builder/config/rally.yaml     | 24 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  1 +
 2 files changed, 25 insertions(+)

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 f7ecf4740d..b853867915 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -32,6 +32,7 @@
           #!/bin/bash -xe
           export PROJECTS="stackforge/rally $PROJECTS"
           export ENABLED_SERVICES=rally
+          export DEVSTACK_GATE_NEUTRON={neutron}
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_TIMEOUT=120
           export RALLY_SCENARIO={scenario}
@@ -64,6 +65,28 @@
     builders:
       - devstack-rally-gate:
           scenario: '{name}'
+          neutron: '0'
+
+    publishers:
+      - devstack-logs
+      - console-log
+      - rally-plot
+
+
+- job-template:
+    name: 'check-rally-dsvm-neutron-{name}'
+    node: 'devstack-precise || devstack-precise-check'
+
+    wrappers:
+      - timeout:
+          timeout: 125
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-rally-gate:
+          scenario: '{name}'
+          neutron: '1'
 
     publishers:
       - devstack-logs
@@ -99,3 +122,4 @@
     name: rally-jobs
     jobs:
       - 'check-rally-dsvm-{name}'
+      - 'check-rally-dsvm-neutron-{name}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0b0c1bb935..f84f067911 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4195,6 +4195,7 @@ projects:
       - gate-rally-install-bare-centos6
       - gate-rally-install-bare-precise
       - check-rally-dsvm-rally
+      - check-rally-dsvm-neutron-rally
       - check-rally-cli
     gate:
       - gate-rally-pep8