Merge "Add gate-climate-devstack-dsvm"

modules/openstack_project/files/jenkins_job_builder/config/climate.yaml

@@ -0,0 +1,35 @@
+- job:
+    name: gate-climate-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=climate
+          export PROJECTS="stackforge/climate $PROJECTS"
+          export PROJECTS="stackforge/python-climateclient $PROJECTS"
+
+          function pre_test_hook {
+              # Install climate devstack integration
+              CLIMATE_BASE=/opt/stack/new/climate/contrib/devstack
+              DEVSTACK_BASE=/opt/stack/new/devstack
+              cp $CLIMATE_BASE/lib/* $DEVSTACK_BASE/lib
+              cp $CLIMATE_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

modules/openstack_project/files/zuul/layout.yaml

@@ -325,6 +325,8 @@ jobs:
     voting: false
   - name: gate-manila-devstack-dsvm
     voting: false
+  - name: gate-climate-devstack-dsvm
+    voting: false
 # puppet-openstack targets
   - name: gate-puppet-vswitch-puppet-lint
     voting: false
@@ -2550,11 +2552,13 @@ projects:
       - gate-climate-python26
       - gate-climate-python27
       - gate-climate-requirements
+      - gate-climate-devstack-dsvm
     gate:
       - gate-climate-pep8
       - gate-climate-python26
       - gate-climate-python27
       - gate-climate-requirements
+      - gate-climate-devstack-dsvm
 
   - name: stackforge/climate-nova
     check: