From f0bf3d7531b12f9c778fc278359bf2bb244ab188 Mon Sep 17 00:00:00 2001
From: Felipe Monteiro <felipe.monteiro@att.com>
Date: Fri, 17 Mar 2017 20:05:00 +0000
Subject: [PATCH] Remove non-voting murano-ci glare gates from murano.

Removes murano-ci glare gates from murano, since murano only
supports glare v0.1, which has been deprecated, so these gates
always fail.

This patch still keeps the checks for glare, in case it is
re-introduced into murano at a later date.

This complements the recently merged change [0] to remove
glare jobs run by infra.

[0] https://review.openstack.org/#/c/445626/

Change-Id: I9d4bada27f25bda7f195c350e7a22b7910d93ee5
---
 murano-ci/jenkins/jobs/murano_jobs.yaml | 6 ------
 murano-ci/zuul/layout.yaml              | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/murano-ci/jenkins/jobs/murano_jobs.yaml b/murano-ci/jenkins/jobs/murano_jobs.yaml
index 740d28ab..e3b02a00 100755
--- a/murano-ci/jenkins/jobs/murano_jobs.yaml
+++ b/murano-ci/jenkins/jobs/murano_jobs.yaml
@@ -144,10 +144,8 @@
     distro: ubuntu
     job-suffix:
         - ''
-        - '-nv'
     pkg-service:
         - ''
-        - '-glare'
     repository: openstack/murano
     tests: 'gate'
     jobs:
@@ -161,12 +159,10 @@
     distro: ubuntu
     job-suffix:
         - ''
-        - '-nv'
     repository: openstack/murano-dashboard
     tests: ''
     pkg-service:
         - ''
-        - '-glare'
     jobs:
         - 'gate-{name}-{distro}{pkg-service}{job-suffix}'
         - 'heartbeat-{name}-{distro}'
@@ -191,10 +187,8 @@
     distro: ubuntu
     job-suffix:
         - ''
-        - '-nv'
     pkg-service:
         - ''
-        - '-glare'
     repository: openstack/python-muranoclient
     tests: ''
     jobs:
diff --git a/murano-ci/zuul/layout.yaml b/murano-ci/zuul/layout.yaml
index 4f0ff594..0851fd7c 100644
--- a/murano-ci/zuul/layout.yaml
+++ b/murano-ci/zuul/layout.yaml
@@ -45,17 +45,14 @@ projects:
   - name: openstack/murano
     check:
       - gate-murano-ubuntu
-      - gate-murano-ubuntu-glare-nv
     check_dashboard:
       - gate-murano-dashboard-ubuntu
-      - gate-murano-dashboard-ubuntu-glare-nv
     post:
       - hook-murano-rtfd
 
   - name: openstack/murano-dashboard
     check:
       - gate-murano-dashboard-ubuntu
-      - gate-murano-dashboard-ubuntu-glare-nv
 
   - name: openstack/murano-agent
     check:
@@ -65,19 +62,15 @@ projects:
   - name: openstack/python-muranoclient
     check:
       - gate-murano-client-ubuntu
-      - gate-murano-client-ubuntu-glare-nv
 
   - name: openstack/murano-deployment
     check:
       - gate-murano-deployment
       - gate-murano-ubuntu-nv
-      - gate-murano-ubuntu-glare-nv
       - gate-murano-dashboard-ubuntu-nv
-      - gate-murano-dashboard-ubuntu-glare-nv
       - gate-murano-agent-ubuntu-nv
       - gate-murano-agent-debian-nv
       - gate-murano-client-ubuntu-nv
-      - gate-murano-client-ubuntu-glare-nv
       - coverage-murano-ubuntu
 
 jobs: