From 64dda8ac65f88503584cc8eb3ce27786bb4afd28 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Wed, 5 Feb 2020 13:31:29 +0000
Subject: [PATCH] Revert "Make Ubuntu jobs voting"

We need to set Ubuntu jobs to non-voting again since Tempest has stopped working with python2 now that some modules are not installed. I think the issue should be solved by just porting Tempest (when installed from source) to use python3.

This reverts commit edd7558ee2ab23539cd14da2e66293a6d24f5885.

Change-Id: I21b4128176372fdfb33f2ef6028d2bf0c59e709a
---
 zuul.d/base.yaml        | 1 +
 zuul.d/integration.yaml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 6f717b9c5..b8750b9fc 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -188,6 +188,7 @@
     name: puppet-openstack-beaker-ubuntu-bionic
     parent: puppet-openstack-beaker-run-base
     nodeset: ubuntu-bionic
+    voting: false
     vars:
       nodepool_type: bionic
       puppet_gem_version: latest
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index c5019fb34..7dca816ed 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -106,6 +106,7 @@
     name: puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
     parent: puppet-openstack-integration-5-scenario001
     nodeset: ubuntu-bionic
+    voting: false
     vars:
       ceph: mimic
 
@@ -130,6 +131,7 @@
     name: puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-5-scenario002
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:
@@ -156,6 +158,7 @@
     name: puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-5-scenario003
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:
@@ -184,6 +187,7 @@
     name: puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
     parent: puppet-openstack-integration-5-scenario004
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:
@@ -273,6 +277,7 @@
     name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-6-scenario003
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars:
@@ -301,6 +306,7 @@
     name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
     parent: puppet-openstack-integration-6-scenario004
     nodeset: ubuntu-bionic
+    voting: false
     # NOTE(tobasco): Should normally not really pass mimic ceph var here but since
     # luminous is not packaged for Bionic repos.pp will fail otherwise.
     vars: