From b6c600738f36e1b296c0145513333a6996767d46 Mon Sep 17 00:00:00 2001
From: vponomaryov <vponomaryov@mirantis.com>
Date: Thu, 13 Oct 2016 15:53:20 +0300
Subject: [PATCH] [Manila] Update grenade job configuration

For the moment grenade manila job uses default heavy 'generic' driver.
But it is redundant. So, do following:
- Switch that job for usage of lightweight dummy driver
- Disable all redundant services
- Make that job non-voting until we merge all required changes to
  manila project according to this change.

Change-Id: I2b698f69a29ef983b13534b2f4d393570be4dac8
---
 jenkins/jobs/manila.yaml   | 14 ++++++++++++--
 jenkins/jobs/projects.yaml |  2 +-
 zuul/layout.yaml           |  3 +--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml
index d311eb9b1e..328bd9c4f8 100644
--- a/jenkins/jobs/manila.yaml
+++ b/jenkins/jobs/manila.yaml
@@ -158,9 +158,11 @@
           export PROJECTS="openstack-dev/grenade $PROJECTS"
           export PROJECTS="openstack/python-manilaclient $PROJECTS"
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_NEUTRON=0
           export DEVSTACK_GATE_GRENADE=pullup
-          export ENABLED_SERVICES=tempest
+
+          # Basic services needed for grenade manila job using dummy driver
+          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
 
           # Enable manila grenade plugin. Provided repo should be
           # cloned by zuul before devstack run and below provided
@@ -170,6 +172,14 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
 
+          function pre_test_hook {{
+              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
+                  True \
+                  dummy \
+                  multibackend
+          }}
+          export -f pre_test_hook
+
           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 fa2ebd0b90..0bb15f9123 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6352,7 +6352,7 @@
             - 'ubuntu-xenial'
           pipeline: 'gate'
           branch-override: default
-          suffix: ''
+          suffix: '-nv'
       - 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ad423418ac..c6498b18e9 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10808,7 +10808,7 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
+      - gate-grenade-dsvm-manila-ubuntu-xenial-nv
     gate:
       - gate-manila-tox-genconfig-ubuntu-trusty
       - gate-manila-tox-genconfig-ubuntu-xenial
@@ -10817,7 +10817,6 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
     post:
       - manila-coverage-db-ubuntu-trusty
       - manila-coverage-db-ubuntu-xenial