From af588a44aa51fb610b8ef8ab8bb36daaebdb3f69 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 18 Oct 2019 16:03:46 +0200
Subject: [PATCH] Switch to opensuse-15 nodeset

opensuse-150 nodeset is referring to openSUSE 15.0, which is still in
maintenance but openSUSE 15.1 has been released already. "opensuse-15"
is going to refer to the "latest openSUSE 15.x" build released and
working for OpenStack going forward, so add this nodeset and use
it by default going forward.

Update all jobs. There were already a few opensuse-15 jobs, so remove
some opensuse-150 jobs since we can use the -15 ones instead.

Change-Id: I695b07933ffcbdf51213442155a9a0e2eab12bbc
---
 zuul.d/jobs.yaml              | 34 ++++++++++++----------------------
 zuul.d/project-templates.yaml | 10 +++++-----
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index adfb2c20ba..12e2a9e14b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -275,29 +275,24 @@
 
 # opensuse
 - job:
-    name: openstack-ansible-deploy-aio_lxc-opensuse-150
+    name: openstack-ansible-deploy-aio_lxc-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-150
+    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_ceph-opensuse-150
+    name: openstack-ansible-deploy-aio_ceph-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_distro_ceph-opensuse-150
+    name: openstack-ansible-deploy-aio_distro_ceph-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-
-- job:
-    name: openstack-ansible-deploy-aio_metal-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
     name: openstack-ansible-deploy-aio_metal-opensuse-15
@@ -305,14 +300,9 @@
     nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+    name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
 
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-opensuse-15
@@ -320,6 +310,6 @@
     nodeset: opensuse-15
 
 - job:
-    name: openstack-ansible-deploy-aio_nspawn-opensuse-150
+    name: openstack-ansible-deploy-aio_nspawn-opensuse-15
     parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
+    nodeset: opensuse-15
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index e6e463cff2..bba4ed8c63 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -52,14 +52,14 @@
         - openstack-ansible-upgrade-aio_lxc-ubuntu-bionic
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_lxc-opensuse-150
+        - openstack-ansible-deploy-aio_lxc-opensuse-15
 
 - project-template:
     name: openstack-ansible-deploy-aio_distro_lxc-jobs
     experimental:
       jobs:
         - openstack-ansible-deploy-aio_distro_lxc-centos-7
-        - openstack-ansible-deploy-aio_distro_lxc-opensuse-150
+        - openstack-ansible-deploy-aio_distro_lxc-opensuse-15
         - openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic
 
 - project-template:
@@ -94,7 +94,7 @@
         - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
+        - openstack-ansible-deploy-aio_telemetry_metal-opensuse-15
 
 - project-template:
     name: openstack-ansible-deploy-aio_distro_metal-jobs
@@ -118,7 +118,7 @@
       jobs:
         - openstack-ansible-deploy-aio_nspawn-centos-7:
             voting: false
-        - openstack-ansible-deploy-aio_nspawn-opensuse-150:
+        - openstack-ansible-deploy-aio_nspawn-opensuse-15:
             voting: false
         - openstack-ansible-deploy-aio_nspawn-ubuntu-bionic:
             voting: false
@@ -151,7 +151,7 @@
     name: openstack-ansible-deploy-distro_ceph-jobs
     experimental:
       jobs:
-        - openstack-ansible-deploy-aio_distro_ceph-opensuse-150
+        - openstack-ansible-deploy-aio_distro_ceph-opensuse-15
 
 - project-template:
     name: openstack-ansible-linters-jobs