From f01167ab9fd829103eecefcfcebd2749c866fdbd Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Thu, 28 Nov 2013 16:01:35 +0100
Subject: [PATCH] Neutron support in Grenade jobs

Currently, Grenade does not support Neutron, and use devstack with
nova-network.
We need to add Neutron support in Grenade jenkins jobs to merge current
grenade patch which aims to support Neutron upgrade testing.

- Create gate-grenade-devstack-vm-neutron-forward
- Create grenade-devstack-vm-neutron and grenade-devstack-vm-neutron-forward job template
- Update Grenade project to use the new jobs

Change-Id: Ia87c65bd92b852601253a65e1025db7c65e38677
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 .../config/devstack-gate.yaml                 | 57 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  | 13 +++++
 2 files changed, 70 insertions(+)

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 b2cc3230ba..74155f7b4c 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
@@ -600,6 +600,61 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-grenade-dsvm-neutron'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_NEUTRON=1
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-grenade-dsvm-neutron-forward'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_GRENADE_FORWARD=1
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
     node: '{node}'
@@ -723,6 +778,8 @@
       - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
       - '{pipeline}-grenade-dsvm'
       - '{pipeline}-grenade-dsvm-forward'
+      - '{pipeline}-grenade-dsvm-neutron'
+      - '{pipeline}-grenade-dsvm-neutron-forward'
       - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e2301c4c22..a066a7c6a9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -133,6 +133,9 @@ jobs:
     voting: false
   - name: ^(gate|check)-grenade-dsvm$
     branch: ^(?!stable/grizzly).*$
+  - name: ^(gate|check)-grenade-dsvm-neutron$
+    branch: ^(?!stable/grizzly).*$
+    voting: false
   - name: gate-tempest-python27
     branch: ^(?!stable/grizzly).*$
     # only here until stable is votable, then merge
@@ -140,6 +143,9 @@ jobs:
   - name: ^(gate|check)-grenade-dsvm-forward$
     branch: ^(stable/).*$
     voting: false
+  - name: ^(gate|check)-grenade-dsvm-neutron-forward
+    branch: ^(stable/).*$
+    voting: false
   - name: gate-grenade-noop
     branch: ^(stable/grizzly).*$
   - name: gate-devstack-bash8
@@ -1113,6 +1119,7 @@ projects:
       - check-tempest-dsvm-neutron-isolated
       - check-tempest-dsvm-neutron-pg-isolated
       - gate-tempest-dsvm-neutron-large-ops
+      - check-grenade-dsvm-neutron
     gate:
       - gate-neutron-requirements
       - gate-neutron-docs
@@ -1124,9 +1131,11 @@ projects:
       - gate-tempest-dsvm-neutron-isolated
       - gate-tempest-dsvm-neutron-pg-isolated
       - gate-tempest-dsvm-neutron-large-ops
+      - gate-grenade-dsvm-neutron
     experimental:
       - gate-tempest-dsvm-neutron-full
       - check-tempest-dsvm-neutron-isolated-parallel
+      - gate-grenade-dsvm-neutron-forward
     post:
       - neutron-branch-tarball
       - neutron-coverage
@@ -1569,10 +1578,14 @@ projects:
       - gate-grenade-noop
       - check-grenade-dsvm
       - check-grenade-dsvm-forward
+      - check-grenade-dsvm-neutron
     gate:
       - gate-grenade-noop
       - gate-grenade-dsvm
       - gate-grenade-dsvm-forward
+      - gate-grenade-dsvm-neutron
+    experimental:
+      - gate-grenade-dsvm-neutron-forward
 
   - name: openstack-dev/cookiecutter
     check: