From 09c7bd99b6ea948393979d5767639042eda88d46 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 20 May 2019 15:56:25 +0200
Subject: [PATCH] Remove openSUSE Leap 42.3  jobs

openSUSE Leap 42.3 is going to be EOL on June 2019, so it is time
to remove jobs. Also rename the Leap 15.0 (opensuse-150) job to
Leap 15 (opensuse-15) so that we can be more easily updating this
to the opensuse-15 nodepool image (which is opensuse 15.1)

Change-Id: I01feece468b2df904b7e1d0c04e36fb7240e7f0d
---
 zuul.d/legacy-bifrost-jobs.yaml | 27 +++------------------------
 zuul.d/project.yaml             | 14 ++++----------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml
index 87f695d66..f4d5d66e9 100644
--- a/zuul.d/legacy-bifrost-jobs.yaml
+++ b/zuul.d/legacy-bifrost-jobs.yaml
@@ -45,14 +45,7 @@
     nodeset: centos-7
 
 - job:
-    name: bifrost-integration-dhcp-opensuse-423
-    parent: bifrost-integration-dhcp
-    nodeset: opensuse-423
-    vars:
-      use_venv: true
-
-- job:
-    name: bifrost-integration-dhcp-opensuse-150
+    name: bifrost-integration-dhcp-opensuse-15
     parent: bifrost-integration-dhcp
     nodeset: opensuse-150
     vars:
@@ -76,14 +69,7 @@
     nodeset: centos-7
 
 - job:
-    name: bifrost-integration-dibipa-debian-opensuse-423
-    parent: bifrost-integration-dibipa-debian
-    nodeset: opensuse-423
-    vars:
-      use_venv: true
-
-- job:
-    name: bifrost-integration-dibipa-debian-opensuse-150
+    name: bifrost-integration-dibipa-debian-opensuse-15
     parent: bifrost-integration-dibipa-debian
     nodeset: opensuse-150
     vars:
@@ -114,14 +100,7 @@
     nodeset: centos-7
 
 - job:
-    name: bifrost-integration-tinyipa-opensuse-423
-    parent: bifrost-integration-tinyipa
-    nodeset: opensuse-423
-    vars:
-      use_venv: true
-
-- job:
-    name: bifrost-integration-tinyipa-opensuse-150
+    name: bifrost-integration-tinyipa-opensuse-15
     parent: bifrost-integration-tinyipa
     nodeset: opensuse-150
     vars:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5af7222d9..83ffcd548 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -9,14 +9,11 @@
       jobs:
         - bifrost-integration-tinyipa-ubuntu-xenial
         - bifrost-integration-tinyipa-keystone-ubuntu-xenial
-        - bifrost-integration-tinyipa-opensuse-423
-        - bifrost-integration-tinyipa-opensuse-150
+        - bifrost-integration-tinyipa-opensuse-15
         # Non-voting jobs
         - bifrost-integration-dhcp-ubuntu-xenial:
             voting: false
-        - bifrost-integration-dhcp-opensuse-423:
-            voting: false
-        - bifrost-integration-dhcp-opensuse-150:
+        - bifrost-integration-dhcp-opensuse-15:
             voting: false
         - bifrost-integration-dhcp-centos-7:
             voting: false
@@ -24,9 +21,7 @@
             voting: false
         - bifrost-integration-dibipa-debian-ubuntu-xenial:
             voting: false
-        - bifrost-integration-dibipa-debian-opensuse-423:
-            voting: false
-        - bifrost-integration-dibipa-debian-opensuse-150:
+        - bifrost-integration-dibipa-debian-opensuse-15:
             voting: false
         - bifrost-integration-tinyipa-centos-7:
             voting: false
@@ -35,6 +30,5 @@
       jobs:
         - bifrost-integration-tinyipa-ubuntu-xenial
         - bifrost-integration-tinyipa-keystone-ubuntu-xenial
-        - bifrost-integration-tinyipa-opensuse-423
-        - bifrost-integration-tinyipa-opensuse-150
+        - bifrost-integration-tinyipa-opensuse-15
         - openstack-tox-lower-constraints