From 6a53e5c79ebb13497a7e3340cdd17d6747a67f4f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 25 Nov 2019 10:50:57 +1100
Subject: [PATCH] Make opensuse-15 job voting again

This reverts the change in I22d4cc02abaecb23d85aec3d415b43501ab1e0d2

Change-Id: Id184420eb58478976aacb8e934b2105b10388bab
---
 tools/update-test-platforms.py       |  6 ++--
 zuul-tests.d/general-roles-jobs.yaml | 41 ++++------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index c87cb1ea9..fc0598389 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -41,10 +41,8 @@ PLATFORMS = [
     'ubuntu-xenial',
 ]
 
-NON_VOTING = [
-    # Sun Nov 24 22:41:16 UTC 2019 : unresolved issues with the mirror
-    'opensuse-15'
-]
+# insert a platform from above to make it non-voting
+NON_VOTING = []
 
 
 def get_nodeset(platform, multinode):
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index 38cbccbee..ee1fcce4e 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -175,8 +175,7 @@
           label: gentoo-17-0-systemd
 
 - job:
-    name: zuul-jobs-test-base-roles-opensuse-15-nv
-    voting: false
+    name: zuul-jobs-test-base-roles-opensuse-15
     description: Tests roles in the 'base' job on opensuse-15
     parent: zuul-jobs-test-base-roles
     tags: auto-generated
@@ -378,8 +377,7 @@
             - secondary
 
 - job:
-    name: zuul-jobs-test-multinode-roles-opensuse-15-nv
-    voting: false
+    name: zuul-jobs-test-multinode-roles-opensuse-15
     description: Tests multinode setup roles on opensuse-15
     parent: zuul-jobs-test-multinode-roles
     tags: auto-generated
@@ -496,7 +494,7 @@
 
 - project:
     check:
-      jobs:
+      jobs: &id001
         - zuul-jobs-test-add-authorized-keys
         - zuul-jobs-test-add-gpgkey
         - zuul-jobs-test-add-sshkey
@@ -505,7 +503,7 @@
         - zuul-jobs-test-base-roles-debian-stretch
         - zuul-jobs-test-base-roles-fedora-29
         - zuul-jobs-test-base-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-base-roles-opensuse-15-nv
+        - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-opensuse-tumbleweed
         - zuul-jobs-test-base-roles-ubuntu-bionic
         - zuul-jobs-test-base-roles-ubuntu-trusty
@@ -519,7 +517,7 @@
         - zuul-jobs-test-multinode-roles-debian-stretch
         - zuul-jobs-test-multinode-roles-fedora-29
         - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-multinode-roles-opensuse-15-nv
+        - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
         - zuul-jobs-test-multinode-roles-ubuntu-trusty
@@ -527,31 +525,4 @@
         - zuul-jobs-test-generate-zuul-manifest
         - zuul-jobs-test-upload-git-mirror
     gate:
-      jobs:
-        - zuul-jobs-test-add-authorized-keys
-        - zuul-jobs-test-add-gpgkey
-        - zuul-jobs-test-add-sshkey
-        - zuul-jobs-test-base-roles-centos-7
-        - zuul-jobs-test-base-roles-centos-8
-        - zuul-jobs-test-base-roles-debian-stretch
-        - zuul-jobs-test-base-roles-fedora-29
-        - zuul-jobs-test-base-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-base-roles-opensuse-tumbleweed
-        - zuul-jobs-test-base-roles-ubuntu-bionic
-        - zuul-jobs-test-base-roles-ubuntu-trusty
-        - zuul-jobs-test-base-roles-ubuntu-xenial
-        - zuul-jobs-test-bindep
-        - zuul-jobs-test-clear-firewall
-        - zuul-jobs-test-netconsole
-        - zuul-jobs-test-dstat-graph
-        - zuul-jobs-test-multinode-roles-centos-7
-        - zuul-jobs-test-multinode-roles-centos-8
-        - zuul-jobs-test-multinode-roles-debian-stretch
-        - zuul-jobs-test-multinode-roles-fedora-29
-        - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
-        - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
-        - zuul-jobs-test-multinode-roles-ubuntu-bionic
-        - zuul-jobs-test-multinode-roles-ubuntu-trusty
-        - zuul-jobs-test-multinode-roles-ubuntu-xenial
-        - zuul-jobs-test-generate-zuul-manifest
-        - zuul-jobs-test-upload-git-mirror
+      jobs: *id001