From 951b30a868ebd6a855f0eb71dd4f6ba023eedd12 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 5 Dec 2013 10:37:59 +1300
Subject: [PATCH] Enable neutron on heat-slow experimental job

The heat-slow tests are written with the assumption
that neutron is enabled.

Change-Id: Ic5bf2c110e21fd15190bc7cd33720e653af9621e
---
 .../files/jenkins_job_builder/config/devstack-gate.yaml     | 5 +++--
 modules/openstack_project/files/zuul/layout.yaml            | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index e53ec6f71c..67bd1b0687 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -29,7 +29,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat-slow{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -44,6 +44,7 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -656,7 +657,7 @@
       - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-heat-slow{branch-designator}'
+      - '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
       - '{pipeline}-grenade-dsvm'
       - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4d11eb60a6..344a96f1a9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -118,7 +118,7 @@ jobs:
   - name: ^(gate|check)-tempest-dsvm-neutron-full$
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: gate-tempest-dsvm-heat-slow
+  - name: gate-tempest-dsvm-neutron-heat-slow
     branch: ^(?!stable/grizzly).*$
     voting: false
   - name: ^(gate|check)-devstack-dsvm-cells$
@@ -1662,7 +1662,7 @@ projects:
       - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental:
-      - gate-tempest-dsvm-heat-slow
+      - gate-tempest-dsvm-neutron-heat-slow
       - gate-grenade-dsvm-stable
       - gate-devstack-dsvm-cells
 
@@ -1750,7 +1750,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-tempest-dsvm-heat-slow
+      - gate-tempest-dsvm-neutron-heat-slow
       - gate-grenade-dsvm-stable
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-neutron-full