From b17fbd3e63b24b6adc1c5755a548735e382740f0 Mon Sep 17 00:00:00 2001
From: vponomaryov <vponomaryov@mirantis.com>
Date: Fri, 13 Jun 2014 15:56:44 +0300
Subject: [PATCH] Added devstack job for manila

This job is intended to be votable devstack job
as required for incubation.
Set it as non-votable to be sure config is correct.

After assurance that this job works well, its votability
should be enabled.

Change-Id: I77add6dabf6608e69d76528729afb411a54c3aad
---
 .../jenkins_job_builder/config/manila.yaml    | 39 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  4 ++
 2 files changed, 43 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
index 7af952b114..fce6db668c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
@@ -1,3 +1,42 @@
+- job:
+    name: gate-manila-devstack-dsvm-neutron
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=35
+          export DEVSTACK_GATE_NEUTRON=1
+          export ENABLED_SERVICES=manila,m-api,m-shr,m-sch
+          export PROJECTS="stackforge/manila $PROJECTS"
+          export PROJECTS="stackforge/python-manilaclient $PROJECTS"
+
+          # Keep localrc to be able to set some vars in pre_test_hook
+          export KEEP_LOCALRC=1
+
+          function pre_test_hook {
+              # plug-in Manila's extension for devstack
+              source $BASE/new/manila/contrib/ci/pre_test_hook.sh
+          }
+          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
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job:
     name: gate-manila-tempest-dsvm-neutron
     node: 'devstack-precise || devstack-trusty'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index add12cc2a7..8c70c36aa4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -628,6 +628,9 @@ jobs:
     voting: false
   - name: gate-manila-tempest-dsvm-neutron-multibackend
     voting: false
+  - name: gate-manila-devstack-dsvm-neutron
+    branch: master
+    voting: false
   - name: gate-blazar-devstack-dsvm
     voting: false
   - name: gate-blazar-pylint
@@ -3604,6 +3607,7 @@ projects:
 
   - name: stackforge/manila
     check:
+      - gate-manila-devstack-dsvm-neutron
       - gate-manila-docs
       - gate-manila-pep8
       - gate-manila-pylint