From df4a4e475f56d2a20478b39c6bd63ccc60823ff8 Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Wed, 25 Mar 2015 15:59:31 -0400
Subject: [PATCH] Add tempest-dsvm-sahara

Because sahara builds on the compute base layer, it does not need to be
tested in all devstack-gate jobs. Instead create a new job that tests
sahara in a devstack environment as a first step in removing it from the
standard configuration.

Specify that SAHARA should be enabled in the devstack updown job
so that the parts that enable sahara are exercised in devstack.
This is already currently the case, but this updates the job config
so that it will continue to do so later when we remove sahara from
the default config.

Change-Id: Iae4e2439bfdfe7f3fc5f0b75b38583a70d7d78f4
Co-Authored-By: James E. Blair <jeblair@hp.com>
---
 jenkins/jobs/devstack-gate.yaml |  1 +
 jenkins/jobs/projects.yaml      |  5 +++++
 jenkins/jobs/sahara.yaml        | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 3c7fb0b39f..e957152ab3 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/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
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 4c11847da4..8120d70d51 100755
--- a/jenkins/jobs/projects.yaml
+++ b/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
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 75d6fb2b27..c1693c8d6a 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/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