From 944ae6e7cde5b07435e462230609ee198fc59b85 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Tue, 19 Nov 2013 01:03:53 -0500
Subject: [PATCH] Add gate-solum-devstack job

Add an initial devstack job for the stackforge project, solum.  It just
installs solum's devstack integration and runs devstack.  That just
ensures that the devstack integration doesn't blow up just trying to
start up the service(s).  There's not much else to test yet, but this is
a starting point to build on.

Start this job out as non-voting so that we can make sure it works as
expected before turning it on to be gating.

Change-Id: I4fd370abfcc51b71b250298163d1348a8a5c1bef
---
 .../jenkins_job_builder/config/solum.yaml     | 33 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 modules/openstack_project/files/jenkins_job_builder/config/solum.yaml

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml
new file mode 100644
index 0000000000..0991fc012f
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml
@@ -0,0 +1,33 @@
+- job:
+    name: gate-solum-devstack-dsvm
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export ENABLED_SERVICES=solum
+
+          function pre_test_hook {{
+              # Install solum devstack integration
+              SOLUM_BASE=/opt/stack/new/solum/contrib/devstack
+              DEVSTACK_BASE=/opt/stack/new/devstack
+              cp ${SOLUM_BASE}/lib/* ${DEVSTACK_BASE}/lib
+              cp ${SOLUM_BASE}/extras.d/* ${DEVSTACK_BASE}/extras.d
+          }}
+          export -f pre_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index fad4cbe511..97f9d59c81 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -305,6 +305,8 @@ jobs:
     voting: false
   - name: gate-rubick-python33
     voting: false
+  - name: gate-solum-devstack-dsvm
+    voting: false
 # puppet-openstack targets
   - name: gate-puppet-vswitch-puppet-lint
     voting: false
@@ -3688,6 +3690,7 @@ projects:
       - gate-solum-python33
       - gate-solum-pypy
       - gate-solum-docs
+      - gate-solum-devstack-dsvm
     gate:
       - gate-solum-pep8
       - gate-solum-python26
@@ -3695,6 +3698,7 @@ projects:
       - gate-solum-python33
       - gate-solum-pypy
       - gate-solum-docs
+      - gate-solum-devstack-dsvm
     post:
       - solum-coverage
       - hook-solum-rtfd