From 935a1ef25e3586795d3d16f8cfcb5198bffb01c3 Mon Sep 17 00:00:00 2001
From: vponomaryov <vponomaryov@mirantis.com>
Date: Tue, 18 Oct 2016 12:56:25 +0300
Subject: [PATCH] [Manila] Temporary disable broken job

CI jobs with generic driver of manila are broken now (b_u_g 1633535).
So, make it non-voting until it is fixed. Also there is no real need
to keep it voting after making 'dummy' driver voting [1] that has
bigger API testing coverage.

[1] I6cff094284d1cc5ff0d669a969dc2f32a034c18c

Change-Id: I3e4b4f7569cc48e01dd7d138332df445de6aa612
---
 jenkins/jobs/projects.yaml | 11 ++++++++++-
 zuul/layout.yaml           |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b5cbeb847e..74829d20bf 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6423,7 +6423,6 @@
       - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
-            - 'ubuntu-xenial'
           description: mysql-generic
           postgres_enabled: '0'
           dhss: '1'
@@ -6431,6 +6430,16 @@
           driver: 'generic'
           test_type: 'api'
           suffix: ''
+      - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
+          node:
+            - 'ubuntu-xenial'
+          description: mysql-generic
+          postgres_enabled: '0'
+          dhss: '1'
+          back_end_type: 'multibackend'
+          driver: 'generic'
+          test_type: 'api'
+          suffix: '-nv'
       - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 37438af07a..6e81f39673 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10799,7 +10799,7 @@ projects:
       - gate-manila-tox-genconfig-ubuntu-xenial
       - gate-manila-pylint
       - gate-manila-tempest-dsvm-mysql-generic-ubuntu-trusty
-      - gate-manila-tempest-dsvm-mysql-generic-ubuntu-xenial
+      - gate-manila-tempest-dsvm-mysql-generic-ubuntu-xenial-nv
       - gate-manila-tempest-dsvm-postgres-container-ubuntu-xenial-nv
       - gate-manila-tempest-dsvm-postgres-zfsonlinux-ubuntu-trusty-nv
       - gate-manila-tempest-dsvm-postgres-zfsonlinux-ubuntu-xenial-nv
@@ -10823,7 +10823,6 @@ projects:
       - gate-manila-tox-genconfig-ubuntu-trusty
       - gate-manila-tox-genconfig-ubuntu-xenial
       - gate-manila-tempest-dsvm-mysql-generic-ubuntu-trusty
-      - gate-manila-tempest-dsvm-mysql-generic-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial