From a61478df1a5736fdc2bcb9f07fceb52d2a9fd804 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Sat, 4 Nov 2017 12:37:36 +1100
Subject: [PATCH] Mark cinder/py35 cross job as non-voting

This seems to be failing more than half the time on
what appears to be a known stestr/unit-testing race.

Related-Bug: #1730518
Change-Id: I1b3b2e79ae95b3d8a02ee64fb421f877838f2404
---
 .zuul.d/cross-jobs.yaml | 2 ++
 .zuul.d/project.yaml    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml
index 189889e662..792dd977e7 100644
--- a/.zuul.d/cross-jobs.yaml
+++ b/.zuul.d/cross-jobs.yaml
@@ -34,6 +34,8 @@
     parent: requirements-cross-test
     description: Run cross-project tests on cinder with py35.
     required-projects: openstack/cinder
+    # cinder seems to have very nasty races in its unit tests
+    voting: false
     vars:
       tox_envlist: py35
 
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 349644c973..16a0b62ccf 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -30,8 +30,6 @@
       jobs:
         - openstack-tox-validate
         - cross-cinder-py27
-        - cross-cinder-py35:
-            branches: ^(?!stable/(newton|ocata)).*$
         - cross-glance-py27
         - cross-glance-py35:
             branches: ^(?!stable/(newton|ocata)).*$