From 14068f5d4a7022edef71095dd45c710d55a9bbea Mon Sep 17 00:00:00 2001
From: Omer Anson <omer.anson@toganetworks.com>
Date: Tue, 6 Sep 2016 13:16:29 +0300
Subject: [PATCH] Add Dragonflow fullstack test for ML2 module

Dragonflow can be used in two modes: core-plugin and ml2 mechanism
driver. In an effort to support ML2 better, we would like to have a
continuous integration testing done on that configuration.

Change-Id: I5d54d022fc1fa4a0e87b946c37a2c3fb6d620886
---
 jenkins/jobs/dragonflow.yaml | 55 ++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml   |  5 ++++
 zuul/layout.yaml             |  1 +
 3 files changed, 61 insertions(+)

diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml
index 20c6d2ce22..361913f103 100644
--- a/jenkins/jobs/dragonflow.yaml
+++ b/jenkins/jobs/dragonflow.yaml
@@ -139,3 +139,58 @@
       - test-results
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-dragonflow-dsvm-fullstack-ml2{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - 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=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          export PROJECTS="openstack/dragonflow $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_ML2_PLUGIN=True"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=df-l3"
+
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc
+
+          function gate_hook {{
+              bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh fullstack
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/post_test_hook.sh fullstack
+          }}
+          export -f post_test_hook
+
+          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 37b7c45f40..793ffdabd1 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3756,6 +3756,11 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
+      - '{pipeline}-dragonflow-dsvm-fullstack-ml2{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: drbd-devstack
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 73aca953ae..e6a4b750be 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8077,6 +8077,7 @@ projects:
       - gate-tempest-dsvm-dragonflow
       - gate-dragonflow-dsvm-rally-nv
       - gate-dragonflow-dsvm-fullstack-nv
+      - gate-dragonflow-dsvm-fullstack-ml2-nv
 
   - name: openstack/drbd-devstack
     template: