From d827f5acdeef50becbab70d7e8b174a59c58a638 Mon Sep 17 00:00:00 2001
From: Ziad Sawalha <gerrit@highbridgellc.com>
Date: Wed, 12 Mar 2014 10:51:26 -0500
Subject: [PATCH] satori: Drop requirements, pypi, and old upstream

- Satori is a stackforge project, so we don't need
the requirements gates. We're also experimenting
with additional checks and those gates block us.
- We manage pypi releases manually there are no
other projects that use Satori through pypi yet.
- The old upstream is going to be deleted.

Change-Id: I4df81ebe5d4268d8da07ad6840f6aebc4d294703
---
 .../files/jenkins_job_builder/config/projects.yaml              | 1 -
 modules/openstack_project/files/review.projects.yaml            | 1 -
 modules/openstack_project/files/zuul/layout.yaml                | 2 --
 3 files changed, 4 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index edca825d35..ef5bf04e7a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -247,7 +247,6 @@
 
     jobs:
       - python-jobs
-      - pypi-jobs
       - hook-{name}-rtfd
 
 - project:
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index fc31e96ac2..5ec836c295 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -799,7 +799,6 @@
   description: Guest agent for Sahara project
   acl-config: /home/gerrit2/acls/stackforge/sahara-guestagent.config
 - project: stackforge/satori
-  upstream: git://github.com/rackerlabs/satori
   description: Configuration Discovery
 - project: stackforge/solum
   description: 'An OpenStack related project designed to make cloud services easier to consume and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 397f67d111..7ab49ab5e7 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4339,11 +4339,9 @@ projects:
     template:
       - name: python-jobs
     check:
-      - gate-satori-requirements
       - gate-satori-python33
       - gate-satori-pypy
     gate:
-      - gate-satori-requirements
       - gate-satori-python33
       - gate-satori-pypy
     post: