From 2b470b07706307b8c25e8fed42e6246e1f0818b0 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Tue, 2 Feb 2016 14:08:01 -0600
Subject: [PATCH] Adding integration test support for lbaas v2 dashboard

Devstack gate job for integration tests.
Non-voting until basic test is stabilized.

Change-Id: I76ab460a110d93b0186ca126858f79ac9e89f09b
Depends-On: I5ca1bf7003a9882648cdfbeab21d2ada37b951f1
---
 jenkins/jobs/neutron-lbaas.yaml | 42 +++++++++++++++++++++++++++++++++
 zuul/layout.yaml                |  4 ++++
 2 files changed, 46 insertions(+)

diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml
index f14c46370f..32700a9991 100644
--- a/jenkins/jobs/neutron-lbaas.yaml
+++ b/jenkins/jobs/neutron-lbaas.yaml
@@ -44,3 +44,45 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job:
+    name: gate-neutron-lbaas-dashboard-dsvm-integration
+    node: devstack-trusty
+
+    wrappers:
+      - build-timeout:
+          timeout: 60
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - firefox-install
+      - xvfb-install
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export DEVSTACK_GATE_NEUTRON=1
+
+          function pre_test_hook {
+              $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/post_test_hook.sh
+          }
+          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
+      - publish-screenshots
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69aff51307..7e18f2582d 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1619,6 +1619,9 @@ jobs:
     branch: ^(?!stable/(icehouse)).*$
     voting: false
 
+  - name: gate-neutron-lbaas-dashboard-dsvm-integration
+    voting: false
+
   - name: ^gate-sahara-dsvm-scenario.*-heat$
     branch: ^(?!stable/(kilo|liberty)).*$
 
@@ -7029,6 +7032,7 @@ projects:
     check:
       - gate-neutron-lbaas-dashboard-npm-run-lint
       - gate-neutron-lbaas-dashboard-npm-run-test
+      - gate-neutron-lbaas-dashboard-dsvm-integration
 
   - name: openstack/neutron-lib
     template: