From 1bc9f8f053f2c246438543680870bd8cdf165e2f Mon Sep 17 00:00:00 2001
From: Chandan Dutta Chowdhury <chandanc@juniper.net>
Date: Sat, 15 Oct 2016 09:41:45 +0000
Subject: [PATCH] Add multinode CI for neutron-fwaas project.

Enable experimental non-voting multinode CI for neutron-fwaas project.

Change-Id: I40e5d62d7bac37305ef59f682bef2d3495dbcec4
---
 jenkins/jobs/neutron-fwaas.yaml | 39 +++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml      | 14 ++++++++++++
 zuul/layout.yaml                |  9 ++++++++
 3 files changed, 62 insertions(+)

diff --git a/jenkins/jobs/neutron-fwaas.yaml b/jenkins/jobs/neutron-fwaas.yaml
index 4ca2113998..6890dc47b5 100644
--- a/jenkins/jobs/neutron-fwaas.yaml
+++ b/jenkins/jobs/neutron-fwaas.yaml
@@ -126,3 +126,42 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="^neutron_fwaas\."
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          export FWAAS_VERSION={fwaas-version}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          if [ "$FWAAS_VERSION" = "v2" ] ; then
+              export ENABLED_SERVICES="q-fwaas-v2"
+          elif [ "$FWAAS_VERSION" = "v1" ] ; then
+              export ENABLED_SERVICES="q-fwaas-v1"
+          fi
+          export DEVSTACK_GATE_TOPOLOGY="multinode"
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 92919c8771..5b7c5772e1 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7837,6 +7837,20 @@
           branch-override: default
           fwaas-version: legacy
           job-suffix: ''
+      - '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          branch-designator: ''
+          branch-override: default
+          fwaas-version: v2
+          job-suffix: '-nv'
+      - '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          branch-designator: ''
+          branch-override: default
+          fwaas-version: v1
+          job-suffix: '-nv'
       - periodic-python-jobs-with-neutron-lib-master
       - '{pipeline}-grenade-dsvm-neutron-fwaas-multinode{job-suffix}':
           pipeline: gate
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 917ae4293a..82360039bb 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2208,6 +2208,12 @@ jobs:
   - name: ^gate-neutron-fwaas-v1-dsvm-tempest$
     branch: ^(?!stable/(liberty|mitaka)).*$
 
+  - name: ^gate-neutron-fwaas-v1-dsvm-tempest-multinode-nv$
+    branch: ^(?!stable/(liberty|mitaka|newton)).*$
+
+  - name: ^gate-neutron-fwaas-v2-dsvm-tempest-multinode-nv$
+    branch: ^(?!stable/(liberty|mitaka|newton)).*$
+
   - name: ^gate-neutron-lbaasv2-dsvm-scenario$
     voting: false
 
@@ -11991,6 +11997,9 @@ projects:
     post:
       - neutron-fwaas-coverage-ubuntu-trusty
       - neutron-fwaas-coverage-ubuntu-xenial
+    experimental:
+      - gate-neutron-fwaas-v1-dsvm-tempest-multinode-nv
+      - gate-neutron-fwaas-v2-dsvm-tempest-multinode-nv
 
   - name: openstack/neutron-lbaas
     template: