From 09e2a307f00ea272e6664d3f4cae79effc5609d2 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 3 Jan 2019 21:20:07 +0100
Subject: [PATCH] Add new Sahara repositories for split plugins

The code of each plugin is a filtered subset of the code
currently available in sahara.git.
Most of the settings are inherited from the existing sahara
repositories (without translations for now, it will be fixed
later).
Make the new repositories known to zuul and
configure the gerritbot notifications.

Needed-By: https://review.openstack.org/628210
Change-Id: I036788e795bdd6cb9cfbe99a38f8542e6eb1c3a1
---
 gerrit/projects.yaml    | 42 +++++++++++++++++++++++++++++++++++++++++
 gerritbot/channels.yaml | 14 ++------------
 zuul/main.yaml          |  6 ++++++
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 3a290642f1..118fc2d09a 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -6859,6 +6859,48 @@
     - sahara
   description: Disk image elements for Sahara
   acl-config: /home/gerrit2/acls/openstack/sahara-etc.config
+- project: openstack/sahara-plugin-ambari
+  description: Ambari provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-ambari
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-cdh
+  description: CDH provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-cdh
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-mapr
+  description: MapR provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-mapr
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-spark
+  description: Spark provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-spark
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-storm
+  description: Storm provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-storm
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-vanilla
+  description: Plain Hadoop (vanilla) provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-vanilla
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
 - project: openstack/sahara-specs
   use-storyboard: true
   groups:
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index c75807921d..73fe8ab724 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1219,11 +1219,7 @@ openstack-merges:
     - openstack/python-troveclient
     - openstack/python-zaqarclient
     - openstack/python-zunclient
-    - openstack/sahara
-    - openstack/sahara-dashboard
-    - openstack/sahara-extra
-    - openstack/sahara-image-elements
-    - openstack/sahara-tests
+    - openstack/sahara.*
     - openstack/swift
     - openstack/swift-bench
     - openstack/tempest
@@ -1609,13 +1605,7 @@ openstack-sahara:
     - openstack/openstack-ansible-os_sahara
     - openstack/puppet-sahara
     - openstack/python-saharaclient
-    - openstack/sahara
-    - openstack/sahara-ci-config
-    - openstack/sahara-dashboard
-    - openstack/sahara-extra
-    - openstack/sahara-image-elements
-    - openstack/sahara-specs
-    - openstack/sahara-tests
+    - openstack/sahara.*
   branches:
     - master
     - ^stable/.*
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 6413be4ab2..cec86dd765 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -1267,6 +1267,12 @@
           - openstack/sahara-dashboard
           - openstack/sahara-extra
           - openstack/sahara-image-elements
+          - openstack/sahara-plugin-ambari
+          - openstack/sahara-plugin-cdh
+          - openstack/sahara-plugin-mapr
+          - openstack/sahara-plugin-spark
+          - openstack/sahara-plugin-storm
+          - openstack/sahara-plugin-vanilla
           - openstack/sahara-specs
           - openstack/sahara-tests
           - openstack/sardonic