From 54fb706ec8b9266ac84e1a6196fa3726d1c92641 Mon Sep 17 00:00:00 2001
From: Jakub Libosvar <libosvar@redhat.com>
Date: Wed, 28 Sep 2016 17:42:25 +0200
Subject: [PATCH] Add scenarios from Neutron to multinode dvr full job

Currently we don't have any job that triggers dvr multinode scenario
tests from Neutron tree. This patch adds introduces such a job for
Neutron experimental queue.

Change-Id: If5e3722c62b470c62b547444c9a1f5938f1c0667
---
 jenkins/jobs/neutron.yaml  | 39 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  6 ++++++
 zuul/layout.yaml           |  1 +
 3 files changed, 46 insertions(+)

diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index 2fd106f2e7..f2e937eb32 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -608,3 +608,42 @@
       - test-results
       - devstack-logs
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_CONFIGDRIVE=0
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="^neutron\.tests\.tempest\.scenario\."
+          # Test DVR works multinode
+          export DEVSTACK_GATE_NEUTRON_DVR=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          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:
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b0f6db2f6a..386d78490f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3804,6 +3804,12 @@
           node: ubuntu-xenial-2-node
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{job-suffix}':
+          pipeline: gate
+          node-release: ubuntu-xenial
+          node: ubuntu-xenial-2-node
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-tempest-dsvm-multinode-live-migration-{node-release}{job-suffix}':
           pipeline: gate
           node-release: ubuntu-xenial
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 88842d9e89..7ca494eb80 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11569,6 +11569,7 @@ projects:
       - gate-neutron-dsvm-fullstack-ubuntu-xenial
       - gate-tempest-dsvm-neutron-scenario
       - gate-tempest-dsvm-neutron-scenario-linuxbridge
+      - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
       - gate-grenade-dsvm-neutron-forward
       - gate-neutron-vpnaas-dsvm-functional
       - gate-neutron-vpnaas-dsvm-functional-sswan