From 4f436c4dff5877de2f8d09791d11641365b1c183 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Fri, 17 Jun 2016 15:25:14 +0200
Subject: [PATCH] Enable Tempest test job also for sahara-tests

Reuse the same job definition used for Sahara, but enable it only
when Tempest files are changed (and not documentation or code
of the scenario tests).

Non-voting for now until it is properly tested.

Change-Id: I78d246d46ae86964a2fa319d3cf937b9d66ca972
---
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 9e17c53777..1b4f478feb 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8505,6 +8505,11 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-sahara{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 45e5e23d53..2ccd37b968 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2053,6 +2053,21 @@ jobs:
   - name: gate-sahara-tests-pylint
     voting: false
 
+  # run tempest tests for sahara-tests only when the directory
+  # which contains the tempest tests is changed.
+  - name: ^gate-tempest-dsvm-sahara.*$
+    skip-if:
+      - project: ^openstack/sahara-tests$
+        all-files-match-any:
+          - ^.*\.rst$
+          - ^doc/.*$
+          - ^releasenotes/.*$
+          - ^etc/.*$
+          - ^sahara_tests/.*$
+          - ^sahara_cli_tests/.*$
+          - ^tools/.*$
+          - ^tox.ini$
+
   - name: gate-app-catalog-ui-dsvm-integration
     voting: false
 
@@ -11451,6 +11466,7 @@ projects:
       - name: release-notes-jobs
     check:
       - gate-sahara-tests-pylint
+      - gate-tempest-dsvm-sahara-nv
       - gate-sahara-tests-dsvm-scenario-neutron-heat
       - gate-sahara-tests-dsvm-scenario-nova-heat
     gate: