From 6b87514b146cc86226be478223838e28925dc63b Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 10 Jun 2019 08:49:10 +0100
Subject: [PATCH] Disable and remove OracleLinux CI jobs

We have agreed to remove support for Oracle Linux, starting by
disabling
the CI jobs.

http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html

Change-Id: I79f6ec98383b1f59b8317a3720f6f9923d6bb21d
---
 zuul.d/jobs.yaml    | 36 ------------------------------------
 zuul.d/project.yaml |  2 --
 2 files changed, 38 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index dda0c0bddd..63340c48f4 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -15,15 +15,6 @@
       base_distro: ubuntu
       install_type: source
 
-- job:
-    name: kolla-ansible-oraclelinux-source
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-centos
-    voting: false
-    vars:
-      base_distro: oraclelinux
-      install_type: source
-
 - job:
     name: kolla-ansible-centos-binary
     parent: kolla-ansible-base
@@ -42,15 +33,6 @@
       base_distro: ubuntu
       install_type: binary
 
-- job:
-    name: kolla-ansible-oraclelinux-binary
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-centos
-    voting: false
-    vars:
-      base_distro: oraclelinux
-      install_type: binary
-
 - job:
     name: kolla-ansible-ubuntu-source-ceph
     parent: kolla-ansible-base
@@ -87,24 +69,6 @@
       secondary2:
         ceph_osd_storetype: bluestore
 
-- job:
-    name: kolla-ansible-oraclelinux-source-ceph
-    parent: kolla-ansible-base
-    nodeset: kolla-ansible-centos-multi
-    timeout: 9000
-    voting: false
-    vars:
-      base_distro: oraclelinux
-      install_type: source
-      scenario: ceph
-    host-vars:
-      primary:
-        ceph_osd_storetype: filestore
-      secondary1:
-        ceph_osd_storetype: bluestore
-      secondary2:
-        ceph_osd_storetype: bluestore
-
 - job:
     name: kolla-ansible-ubuntu-source-cinder-lvm
     parent: kolla-ansible-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 793201a819..95aa5f3478 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -13,10 +13,8 @@
       jobs:
         - kolla-ansible-centos-source
         - kolla-ansible-ubuntu-source
-        - kolla-ansible-oraclelinux-source
         - kolla-ansible-ubuntu-source-ceph
         - kolla-ansible-centos-source-ceph
-        - kolla-ansible-oraclelinux-source-ceph
         - kolla-ansible-ubuntu-source-cinder-lvm:
             files: ^ansible\/roles\/(cinder|iscsi)\/.*
         - kolla-ansible-centos-source-cinder-lvm: