Merge "Added devstack job for manila"

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'

modules/openstack_project/files/zuul/layout.yaml

@@ -636,6 +636,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
@@ -3646,6 +3649,7 @@ projects:
 
   - name: stackforge/manila
     check:
+      - gate-manila-devstack-dsvm-neutron
       - gate-manila-docs
       - gate-manila-pep8
       - gate-manila-pylint