From f825ea54f6f60e064e41213272c8ea8e5e21811d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 12 Jun 2012 09:37:21 -0400
Subject: [PATCH] Remove melange related jobs.

Change-Id: Id97d94c495c4a021786d28df813c863adac8984f
---
 manifests/site.pp                             |  4 ---
 .../files/projects/openstack/melange.yml      | 10 -------
 .../openstack/python-melangeclient.yml        | 10 -------
 .../files/zuul/layout.yaml                    | 26 -------------------
 4 files changed, 50 deletions(-)
 delete mode 100644 modules/jenkins_jobs/files/projects/openstack/melange.yml
 delete mode 100644 modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml

diff --git a/manifests/site.pp b/manifests/site.pp
index d2e0bf641d..6754325cf6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -255,14 +255,12 @@ node "jenkins.openstack.org" {
       'glance',
       'horizon',
       'keystone',
-      'melange',
       'nova',
       'openstack-ci-puppet',
       'pypi-mirror',
       'python-cinderclient',
       'python-glanceclient',
       'python-keystoneclient',
-      'python-melangeclient',
       'python-novaclient',
       'python-openstackclient',
       'python-quantumclient',
@@ -437,13 +435,11 @@ node "pypi.openstack.org" {
       'glance',
       'horizon',
       'keystone',
-      'melange',
       'nova',
       'openstack-common',
       'python-cinderclient',
       'python-glanceclient',
       'python-keystoneclient',
-      'python-melangeclient',
       'python-novaclient',
       'python-openstackclient',
       'python-quantumclient',
diff --git a/modules/jenkins_jobs/files/projects/openstack/melange.yml b/modules/jenkins_jobs/files/projects/openstack/melange.yml
deleted file mode 100644
index 40bafe7bae..0000000000
--- a/modules/jenkins_jobs/files/projects/openstack/melange.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-project:
-  template: 'python_jobs'
-
-values:
-  name: 'melange'
-  disabled: 'false'
-  github_org: 'openstack'
-  review_site: 'review.openstack.org'
-  publisher_site: 'nova.openstack.org'
-  node: 'precise'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml
deleted file mode 100644
index f318e13e3e..0000000000
--- a/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-project:
-  template: 'python_jobs'
-
-values:
-  name: 'python-melangeclient'
-  disabled: 'false'
-  github_org: 'openstack'
-  review_site: 'review.openstack.org'
-  publisher_site: 'nova.openstack.org'
-  node: 'precise'
diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml
index e032d50d4c..dc712744fa 100644
--- a/modules/openstack-ci-config/files/zuul/layout.yaml
+++ b/modules/openstack-ci-config/files/zuul/layout.yaml
@@ -134,20 +134,6 @@ projects:
     silent:
         - gate-tempest-devstack-vm
 
-  - name: openstack/melange
-    check:
-      - gate-melange-merge:
-        - gate-melange-pep8
-        - gate-melange-python26
-        - gate-melange-python27
-    gate:
-      - gate-melange-merge:
-        - gate-melange-pep8
-        - gate-melange-python26
-        - gate-melange-python27
-    silent:
-        - gate-tempest-devstack-vm
-
   - name: openstack/nova
     check:
       - gate-nova-merge:
@@ -234,18 +220,6 @@ projects:
     silent:
         - gate-tempest-devstack-vm
 
-  - name: openstack/python-melangeclient
-    check:
-      - gate-python-melangeclient-merge:
-        - gate-python-melangeclient-pep8
-        - gate-python-melangeclient-python26
-        - gate-python-melangeclient-python27
-    gate:
-      - gate-python-melangeclient-merge:
-        - gate-python-melangeclient-pep8
-        - gate-python-melangeclient-python26
-        - gate-python-melangeclient-python27
-
   - name: openstack/python-novaclient
     check:
       - gate-python-novaclient-merge: