From 895271261f1ccf6324f986d29f64fe63fd5b0a43 Mon Sep 17 00:00:00 2001
From: Julie Pichon <jpichon@redhat.com>
Date: Mon, 18 Aug 2014 16:01:51 +0100
Subject: [PATCH] Add integration tests to the Horizon gate

Initial attempt at a job inspired by the existing scripts for the
Neutron and Swift functional tests.

Change-Id: I12b6150dc6a320a3a4ddff189ff5153eece9f0de
Partial-Bug: #1355186
---
 .../jenkins_job_builder/config/horizon.yaml   | 38 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  4 ++
 2 files changed, 42 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
index 9ffc2df2cf..bcc44d7180 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
@@ -41,3 +41,41 @@
 
     publishers:
       - console-log
+
+- job:
+    name: gate-horizon-dsvm-integration
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 95
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=90
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {{
+              cd /opt/stack/new/horizon
+              tox -e py27integration
+          }}
+          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/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 1b9d057299..9ad79b84f6 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -780,6 +780,9 @@ jobs:
     voting: false
   - name: gate-oslo.db-tox-sqla_09
     voting: false
+  - name: gate-horizon-dsvm-integration
+    branch: ^(?!stable/(havana|icehouse)).*$
+    voting: false
 
 # The project list is grouped by type of project, and within each
 # group, projects are sorted (mostly) alphabetically.
@@ -1068,6 +1071,7 @@ projects:
       - gate-horizon-selenium
       - check-devstack-dsvm-cells
     experimental:
+      - gate-horizon-dsvm-integration
       - gate-grenade-dsvm-forward
     pre-release:
       - horizon-tarball