From c2a8a2a4d4757fdcb8f5fce73f10e16a64818d68 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean_mcginnis@dell.com>
Date: Wed, 11 Jan 2017 12:05:17 -0600
Subject: [PATCH] Remove sheepdog jobs from cinder queue

The sheepdog driver currently has an issue with its new license that
no longer qualifies it to have CI run by infra resources. The driver
is also going to be marked as unsupported in Cinder and removed in
the Pike release if we can't resolve the licensing concerns.

Change-Id: I49dab60f34658a352c90b2b5ac2a4d8ea3922e97
---
 jenkins/jobs/projects.yaml | 9 ---------
 zuul/layout.yaml           | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a55236c7c1..d0c62cebb6 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3820,15 +3820,6 @@
           node:
             - ubuntu-trusty
             - ubuntu-xenial
-      - '{pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}-{node}{suffix}':
-          pipeline: gate
-          plugin: sheepdog
-          plugin-repo: openstack/devstack-plugin-sheepdog
-          srcname: os-brick
-          suffix: '-nv'
-          node:
-            - ubuntu-trusty
-            - ubuntu-xenial
 
 - project:
     name: devstack-plugin-tar-installer
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4c8ab5d7fb..6531a86315 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2354,9 +2354,6 @@ jobs:
   - name: ^gate-tempest-dsvm-full-lio-ubuntu-xenial.*$
     branch: ^(?!(stable/mitaka|driverfixes/)).*$
 
-  - name: ^gate-tempest-dsvm-full-sheepdog-ubuntu-xenial.*$
-    branch: ^(?!(stable/mitaka|driverfixes/)).*$
-
   - name: gate-tempest-dsvm-neutron-full-ubuntu-xenial
     # This job is part of integrated gate queue, use it to name the queue.
     # Note that the above needs to be a name and not a regex so that
@@ -6230,8 +6227,6 @@ projects:
       - gate-tempest-dsvm-lvm-multibackend-ubuntu-xenial-nv
       # These jobs test open source plugins and must remain with the -nv branch
       # designator unless cinder gives permission.
-      - gate-tempest-dsvm-full-sheepdog-ubuntu-trusty-nv
-      - gate-tempest-dsvm-full-sheepdog-ubuntu-xenial-nv
       - gate-tempest-dsvm-full-drbd-devstack-ubuntu-trusty-nv
       - gate-tempest-dsvm-full-drbd-devstack-ubuntu-xenial-nv
       - gate-tempest-dsvm-full-lio-ubuntu-trusty
@@ -6245,8 +6240,6 @@ projects:
       - gate-grenade-dsvm-cinder-multinode-ubuntu-xenial
     experimental:
       - gate-grenade-dsvm-forward-ubuntu-trusty
-      - gate-tempest-dsvm-full-sheepdog-src-os-brick-ubuntu-trusty-nv
-      - gate-tempest-dsvm-full-sheepdog-src-os-brick-ubuntu-xenial-nv
       - gate-tempest-dsvm-full-devstack-plugin-nfs-nv
       - gate-tempest-dsvm-zeromq-multibackend-ubuntu-xenial
 
@@ -9923,8 +9916,6 @@ projects:
     check:
       - gate-tempest-dsvm-full-ceph-plugin-src-glance_store-ubuntu-trusty
       - gate-tempest-dsvm-full-ceph-plugin-src-glance_store-ubuntu-xenial
-      - gate-tempest-dsvm-full-sheepdog-ubuntu-trusty-nv
-      - gate-tempest-dsvm-full-sheepdog-ubuntu-xenial-nv
     gate:
       - gate-tempest-dsvm-full-ceph-plugin-src-glance_store-ubuntu-trusty
       - gate-tempest-dsvm-full-ceph-plugin-src-glance_store-ubuntu-xenial