From 687edc5f4c4bdbaca8516e0ffdc83f26c3fc81a2 Mon Sep 17 00:00:00 2001
From: Ramy Asselin <ramy.asselin@hp.com>
Date: Fri, 30 Jan 2015 15:01:17 -0800
Subject: [PATCH] Clean-up deleted/refactored puppet module repo not

Project-config was prepared for the puppet module split by pre-merging
numerous changes: I311af3f7eb724115ba6a2496d0aea4910a98f632

Now that the work is complete, there are some that were not split
but rather deleted and/or refactored.

Clean these up now, as planned.

Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html

Change-Id: Ic461b639e2450cc325fb82565a88c9cc65962491
---
 gerritbot/channels.yaml    |  6 ------
 jenkins/jobs/projects.yaml | 16 ----------------
 zuul/layout.yaml           | 12 ------------
 3 files changed, 34 deletions(-)

diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index e3ac96068a..09e91b6ad1 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -72,8 +72,6 @@ openstack-infra:
       - openstack-infra/puppet-pip
       - openstack-infra/puppet-planet
       - openstack-infra/puppet-project_config
-      - openstack-infra/puppet-puppetboot
-      - openstack-infra/puppet-recheckwatch
       - openstack-infra/puppet-redis
       - openstack-infra/puppet-releasestatus
       - openstack-infra/puppet-reviewday
@@ -84,7 +82,6 @@ openstack-infra:
       - openstack-infra/puppet-statusbot
       - openstack-infra/puppet-storyboard
       - openstack-infra/puppet-subunit2sql
-      - openstack-infra/puppet-subversion
       - openstack-infra/puppet-sudoers
       - openstack-infra/puppet-tmpreaper
       - openstack-infra/puppet-ulimit
@@ -930,8 +927,6 @@ openstack-merges:
       - openstack-infra/puppet-pip
       - openstack-infra/puppet-planet
       - openstack-infra/puppet-project_config
-      - openstack-infra/puppet-puppetboot
-      - openstack-infra/puppet-recheckwatch
       - openstack-infra/puppet-redis
       - openstack-infra/puppet-releasestatus
       - openstack-infra/puppet-reviewday
@@ -942,7 +937,6 @@ openstack-merges:
       - openstack-infra/puppet-statusbot
       - openstack-infra/puppet-storyboard
       - openstack-infra/puppet-subunit2sql
-      - openstack-infra/puppet-subversion
       - openstack-infra/puppet-sudoers
       - openstack-infra/puppet-tmpreaper
       - openstack-infra/puppet-ulimit
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index f6abbc25a9..dd6f7d1aba 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2346,14 +2346,6 @@
     jobs:
       - puppet-check-jobs
 
-- project:
-    name: puppet-recheckwatch
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - puppet-check-jobs
-
 - project:
     name: puppet-redis
     node: 'bare-precise || bare-trusty'
@@ -2436,14 +2428,6 @@
     jobs:
       - puppet-check-jobs
 
-- project:
-    name: puppet-subversion
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - puppet-check-jobs
-
 - project:
     name: puppet-sudoers
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0c9a2dfb09..4f6fec46a4 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3577,12 +3577,6 @@ projects:
       - name: puppet-check-jobs
       - name: infra-puppet-apply-jobs
 
-  - name: openstack-infra/puppet-recheckwatch
-    template:
-      - name: merge-check
-      - name: puppet-check-jobs
-      - name: infra-puppet-apply-jobs
-
   - name: openstack-infra/puppet-redis
     template:
       - name: merge-check
@@ -3647,12 +3641,6 @@ projects:
       - name: puppet-check-jobs
       - name: infra-puppet-apply-jobs
 
-  - name: openstack-infra/puppet-subversion
-    template:
-      - name: merge-check
-      - name: puppet-check-jobs
-      - name: infra-puppet-apply-jobs
-
   - name: openstack-infra/puppet-sudoers
     template:
       - name: merge-check