Merge "Add tempest-dsvm-sahara"

jenkins/jobs/devstack-gate.yaml

@@ -600,6 +600,7 @@
           export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_TROVE=1
           export DEVSTACK_GATE_HEAT=1
+          export DEVSTACK_GATE_SAHARA=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

jenkins/jobs/projects.yaml

@@ -598,6 +598,11 @@
       - openstack-publish-jobs
       - gate-{name}-tox-{envlist}:
           envlist: "py27-scenario-unit"
+      - '{pipeline}-tempest-dsvm-sahara{branch-designator}':
+          pipeline: check
+          node: 'devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: sahara-specs

jenkins/jobs/sahara.yaml

@@ -111,10 +111,41 @@
               $BASE/new/python-saharaclient/saharaclient/tests/functional/hooks/post_test_hook.sh
           }}
           export -f post_test_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
     publishers:
       - test-results
       - devstack-logs
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-sahara{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="data_processing"
+          export DEVSTACK_GATE_SAHARA=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          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