From d8e38615cd4f0cd0f40eb812561da00ba2f9acb7 Mon Sep 17 00:00:00 2001
From: Valeriy Ponomaryov <vponomaryov@mirantis.com>
Date: Wed, 4 Dec 2013 12:07:52 +0200
Subject: [PATCH] Add gate-manila-devstack job

Add an initial devstack job for the stackforge project, manila.
It just installs manila'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).

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: I7fde5a3d456a66404e86e7ead7e51038a291f039
---
 .../jenkins_job_builder/config/manila.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/manila.yaml

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
new file mode 100644
index 0000000000..68ddfe1b06
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
@@ -0,0 +1,33 @@
+- job:
+    name: gate-manila-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=manila,m-api,m-shr,m-sch
+
+          function pre_test_hook {
+              # Install Manila devstack integration
+              MANILA_BASE=/opt/stack/new/manila/contrib/devstack
+              DEVSTACK_BASE=/opt/stack/new/devstack
+              cp ${MANILA_BASE}/lib/* ${DEVSTACK_BASE}/lib
+              cp ${MANILA_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 4d11eb60a6..063e0b5c9d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -315,6 +315,8 @@ jobs:
     voting: false
   - name: gate-solum-devstack-dsvm
     voting: false
+  - name: gate-manila-devstack-dsvm
+    voting: false
 # puppet-openstack targets
   - name: gate-puppet-vswitch-puppet-lint
     voting: false
@@ -3748,10 +3750,12 @@ projects:
       - gate-manila-pep8
       - gate-manila-python26
       - gate-manila-python27
+      - gate-manila-devstack-dsvm
     gate:
       - gate-manila-pep8
       - gate-manila-python26
       - gate-manila-python27
+      - gate-manila-devstack-dsvm
     post:
       - manila-branch-tarball
       - manila-coverage