From eef784eaaeec32136104478ea177191c90c1a153 Mon Sep 17 00:00:00 2001
From: vponomaryov <vponomaryov@mirantis.com>
Date: Fri, 10 Jun 2016 18:48:44 +0300
Subject: [PATCH] [Manila] Add new experimental job

Manila project is going to test its APIs using dummy driver
that does not really provide resources and just simulates
share driver behaviour.

For this we need to have separate tempest job, without any other
OpenStack projects, just manila.
Therefore, add such, make it non-voting and experimental until
appropriate feature merged in manila and becomes stable.

Change-Id: Iea5d982c9c147a37c57db0cdab9dc305f4f8fa81
---
 jenkins/jobs/manila.yaml   | 18 ++++++++++--------
 jenkins/jobs/projects.yaml |  4 ++++
 zuul/layout.yaml           |  5 +++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml
index 58a0ae73b4..f170ad92b9 100644
--- a/jenkins/jobs/manila.yaml
+++ b/jenkins/jobs/manila.yaml
@@ -67,8 +67,8 @@
       - devstack-logs
       - console-log
 
-- job:
-    name: 'gate-manila-tempest-minimal-dsvm-lvm'
+- job-template:
+    name: 'gate-manila-tempest-minimal-dsvm-{driver}'
     node: ubuntu-trusty
 
     wrappers:
@@ -77,6 +77,8 @@
       - timestamps
 
     builders:
+      - print-template-name:
+          template-name: "{template-name}"
       - link-logs
       - net-info
       - devstack-checkout
@@ -96,17 +98,17 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
 
-          function pre_test_hook {
+          function pre_test_hook {{
               # 'dhss' - acronym for 'Driver Handles Share Servers',
               # defines mode of a share driver. Boolean-like.
               # 'driver' - codename of a share driver to configure.
               # 'back_end_type' - defines which installation Manila should
               # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False lvm multibackend
-          }
+              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False {driver} multibackend
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               # 'back_end_type' - defines which installation Manila is
               # configured to - either 'singlebackend' or 'multibackend'.
               # 'driver' - codename of a share driver that is configured in
@@ -116,8 +118,8 @@
               # can have 'api' and 'scenario' values.
               # 'postgres_enabled' - set of test suites depends on DB backend
               # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend lvm api False
-          }
+              source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend {driver} api False
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index dcda0c1ba6..c1fbf22d88 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3196,6 +3196,10 @@
       - '{pipeline}-grenade-dsvm-manila':
           pipeline: 'gate'
           branch-override: default
+      - 'gate-manila-tempest-minimal-dsvm-{driver}':
+          driver: 'lvm'
+      - 'gate-manila-tempest-minimal-dsvm-{driver}':
+          driver: 'dummy'
       - 'gate-manila-tempest-dsvm-{description}':
           description: postgres-generic-singlebackend
           postgres_enabled: '1'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8cec3f5b38..925fa0ce35 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2223,6 +2223,10 @@ jobs:
   - name: gate-manila-tempest-minimal-dsvm-lvm
     branch: ^(?!stable/(?:kilo|liberty)).*$
 
+  - name: gate-manila-tempest-minimal-dsvm-dummy
+    branch: ^(?!stable/(?:liberty|mitaka)).*$
+    voting: false
+
   - name: gate-tempest-dsvm-full-amqp1
     voting: false
 
@@ -7350,6 +7354,7 @@ projects:
     post:
       - manila-coverage-db
     experimental:
+      - gate-manila-tempest-minimal-dsvm-dummy
       - gate-rally-dsvm-manila-multibackend
       - gate-rally-dsvm-manila-multibackend-no-ss
       - gate-manila-tempest-dsvm-postgres-container