Merge "satori: Drop requirements, pypi, and old upstream"

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -247,7 +247,6 @@
 
     jobs:
       - python-jobs
-      - pypi-jobs
       - hook-{name}-rtfd
 
 - project:

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'

modules/openstack_project/files/zuul/layout.yaml

@@ -4309,11 +4309,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: