From 0e08bdde5c83699c8c7412169985d78617e1670b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 19 Aug 2019 09:31:46 +0200
Subject: [PATCH] Switch openSUSE jobs to version 15

Version 42.3 is dead, use 15 instead. Make job non-voting for now.

Change-Id: I4f5e7a69658f0005341a4891218690210eb27b9e
---
 zuul.d/jobs.yaml    | 19 +++++++------------
 zuul.d/project.yaml |  7 +++----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9d72dba3..60b30ada 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -56,15 +56,15 @@
       test_clustered_elk: true
 
 - job:
-    name: "openstack-ansible-ops:elk_metrics_6x-opensuse-423"
+    name: "openstack-ansible-ops:elk_metrics_6x-opensuse-15"
     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
-    nodeset: opensuse-423
-    voting: true
+    nodeset: opensuse-15
+    voting: false
 
 - job:
-    name: "openstack-ansible-ops:elk_metrics_6x-opensuse-423-clustered"
+    name: "openstack-ansible-ops:elk_metrics_6x-opensuse-15-clustered"
     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
-    nodeset: opensuse-423
+    nodeset: opensuse-15
     voting: false
     vars:
       osa_test_repo: "openstack/openstack-ansible-ops"
@@ -153,11 +153,6 @@
     nodeset: centos-7
 
 - job:
-    name: "openstack-ansible-ops:skydive-opensuse-423"
+    name: "openstack-ansible-ops:skydive-opensuse-15"
     parent: "openstack-ansible-ops:skydive-ubuntu-xenial"
-    nodeset: opensuse-423
-
-# - job:
-#     name: "openstack-ansible-ops:skydive-opensuse-15"
-#     parent: "openstack-ansible-ops:skydive-ubuntu-xenial"
-#     nodeset: opensuse-15
+    nodeset: opensuse-15
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f89a651c..f03c41a4 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,8 +21,8 @@
         - openstack-ansible-linters
         - openstack-ansible-ops:elk_metrics_6x-centos-7
         # - openstack-ansible-ops:elk_metrics_6x-centos-7-clustered
-        - openstack-ansible-ops:elk_metrics_6x-opensuse-423
-        # - openstack-ansible-ops:elk_metrics_6x-opensuse-423-clustered
+        - openstack-ansible-ops:elk_metrics_6x-opensuse-15
+        # - openstack-ansible-ops:elk_metrics_6x-opensuse-15-clustered
         - openstack-ansible-ops:elk_metrics_6x-ubuntu-trusty
         - openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial
         - openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic
@@ -36,8 +36,7 @@
         - openstack-ansible-ops:skydive-ubuntu-xenial
         - openstack-ansible-ops:skydive-ubuntu-bionic
         - openstack-ansible-ops:skydive-centos-7
-        - openstack-ansible-ops:skydive-opensuse-423
-        # - openstack-ansible-ops:skydive-opensuse-15
+        - openstack-ansible-ops:skydive-opensuse-15
     gate:
       jobs:
         - openstack-ansible-linters