From 29d1de3b7d8419d9b2d65802cfa5062726ea5b28 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 21 Jun 2018 16:58:19 -0500
Subject: [PATCH] Use wildcard to apply system-required template

We require all projects to have the system-required template ... unless
we aren't gating them which is the case for ansible/ansible and
kata-containers/proxy. That's a bunch of boilerplate though, and zuul
now supports wildcard project configuration.

Make a wildcard config that applies to every project starting with
openstack that contains system-required. Remove the projects that didn't
have anything but that.

Change-Id: Ic1099625ae0500657e01e7cf48bce1273f7e0e24
---
 tools/zuul-projects-checks.py |   30 +-
 zuul.d/projects.yaml          | 1675 +--------------------------------
 2 files changed, 11 insertions(+), 1694 deletions(-)

diff --git a/tools/zuul-projects-checks.py b/tools/zuul-projects-checks.py
index cbcc0693f5..a2d2826734 100755
--- a/tools/zuul-projects-checks.py
+++ b/tools/zuul-projects-checks.py
@@ -23,33 +23,6 @@ projects_yaml = 'zuul.d/projects.yaml'
 projects = yaml.safe_load(open(projects_yaml))
 
 
-def check_system_templates():
-    """Check that each repo has a system-required template."""
-
-    errors = False
-    print("\nChecking for usage of system-required")
-    print("=====================================")
-    for entry in projects:
-        project = entry['project']
-        if not project['name'].startswith('openstack'):
-            continue
-        try:
-            correct = False
-            for template in project['templates']:
-                if template == 'system-required':
-                    correct = True
-            if not correct:
-                raise
-        except:
-            print("ERROR: Project %s has no system-required template" %
-                  project['name'])
-            errors = True
-
-    if not errors:
-        print("... all fine.")
-    return errors
-
-
 def normalize(s):
     "Normalize string for comparison."
     return s.lower().replace("_", "-")
@@ -163,8 +136,7 @@ def check_voting():
 
 def check_all():
 
-    errors = check_system_templates()
-    errors = check_projects_sorted() or errors
+    errors = check_projects_sorted()
     errors = check_release_jobs() or errors
     errors = check_voting() or errors
 
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 4854b477dd..dabdcad749 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -1,10 +1,15 @@
 # Shared zuul config specific to the OpenStack Project
 # Contains project pipeline definitions
 
+- project:
+    # Only include system-required on openstack repos so that we don't
+    # run merge-check on third-party things like kata or ansible
+    name: ^openstack.*
+    templates:
+      - system-required
+
 - project:
     name: ansible/ansible
-    # ansible/ansible does not include system-required on purpose. We do not
-    # gate ansible/ansible and we should not be doing merge-check on it.
     third-party-check:
       jobs:
         - openstacksdk-ansible-devel-functional-devstack:
@@ -34,9 +39,6 @@
 
 - project:
     name: kata-containers/proxy
-    # kata-containers/proxy does not include system-required on purpose. We
-    # do not gate kata-containers/proxy and we should not be doing
-    # merge-check on it.
     third-party-check:
       jobs:
         - kata-runsh
@@ -45,7 +47,6 @@
 - project:
     name: openstack-dev/bashate
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -55,19 +56,16 @@
 - project:
     name: openstack-dev/ci-sandbox
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-dev/cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-dev/devstack
     templates:
-      - system-required
       - integrated-gate
       - integrated-gate-py35
       - publish-openstack-sphinx-docs
@@ -170,19 +168,15 @@
 - project:
     name: openstack-dev/devstack-plugin-cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-dev/devstack-vagrant
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-dev/grenade
-    templates:
-      - system-required
     check:
       jobs:
         - neutron-grenade:
@@ -239,7 +233,6 @@
 - project:
     name: openstack-dev/hacking
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -253,32 +246,23 @@
 - project:
     name: openstack-dev/heat-cfnclient
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack-dev/openstack-nose
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-dev/os-http
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
-- project:
-    name: openstack-dev/oslo-cookiecutter
-    templates:
-      - system-required
-
 - project:
     name: openstack-dev/pbr
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - lib-forward-testing
@@ -310,7 +294,6 @@
         - release-openstack-python
         - legacy-sandbox-tag
     templates:
-      - system-required
       - noop-jobs
     pre-release:
       jobs:
@@ -319,44 +302,37 @@
 - project:
     name: openstack-dev/specs-cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/activity-board
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/ansible-role-puppet
     templates:
-      - system-required
       - ansible-lint-jobs
       - infra-puppet-apply-jobs
 
 - project:
     name: openstack-infra/askbot-theme
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/beaker-localhost
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/beaker-nodepool
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/bindep
     templates:
-      - system-required
       - openstack-pypy-jobs-nonvoting
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
@@ -369,7 +345,6 @@
 - project:
     name: openstack-infra/bugdaystats
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -384,13 +359,11 @@
 - project:
     name: openstack-infra/ciwatch
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
 
 - project:
     name: openstack-infra/devstack-gate
     templates:
-      - system-required
       - integrated-gate
       - integrated-gate-py35
       - openstack-python35-jobs
@@ -437,7 +410,6 @@
 - project:
     name: openstack-infra/elastic-recheck
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-infra
     check:
       jobs:
@@ -451,19 +423,16 @@
 - project:
     name: openstack-infra/err2d2
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/featuretracker
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/gear
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - docs-on-readthedocs
@@ -471,8 +440,6 @@
 
 - project:
     name: openstack-infra/gearman-plugin
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-gearman-plugin-maven-build-ubuntu-trusty
@@ -492,20 +459,13 @@
 - project:
     name: openstack-infra/germqtt
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
 
-- project:
-    name: openstack-infra/gerrit
-    templates:
-      - system-required
-
 - project:
     name: openstack-infra/gerritbot
     templates:
-      - system-required
       - publish-to-pypi
     post:
       jobs:
@@ -514,7 +474,6 @@
 - project:
     name: openstack-infra/gerritlib
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
@@ -522,7 +481,6 @@
 - project:
     name: openstack-infra/git-restack
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
@@ -531,21 +489,14 @@
 - project:
     name: openstack-infra/git-review
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
       - release-openstack-sphinx-docs-infra
 
-- project:
-    name: openstack-infra/gitdm
-    templates:
-      - system-required
-
 - project:
     name: openstack-infra/glean
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-openstack-sphinx-docs-infra
@@ -570,7 +521,6 @@
 - project:
     name: openstack-infra/grafyaml
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-openstack-sphinx-docs-infra
@@ -584,8 +534,6 @@
 
 - project:
     name: openstack-infra/groups
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-groups-unittests
@@ -602,18 +550,11 @@
 - project:
     name: openstack-infra/groups-static-pages
     templates:
-      - system-required
       - noop-jobs
 
-- project:
-    name: openstack-infra/infra-ansible
-    templates:
-      - system-required
-
 - project:
     name: openstack-infra/infra-manual
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -622,13 +563,10 @@
 - project:
     name: openstack-infra/infra-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack-infra/irc-meetings
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -642,7 +580,6 @@
 - project:
     name: openstack-infra/jeepyb
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -654,7 +591,6 @@
 - project:
     name: openstack-infra/jenkins-job-builder
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-openstack-sphinx-docs-infra
@@ -671,14 +607,12 @@
 - project:
     name: openstack-infra/js-afs-blob-store
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
 - project:
     name: openstack-infra/js-generator-openstack
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-docs
       - nodejs4-publish-to-npm
@@ -694,14 +628,11 @@
 - project:
     name: openstack-infra/js-openstack-registry-hooks
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
 - project:
     name: openstack-infra/lodgeit
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -714,7 +645,6 @@
 - project:
     name: openstack-infra/log-classify
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     check:
       jobs:
@@ -728,7 +658,6 @@
 - project:
     name: openstack-infra/log_processor
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - publish-openstack-sphinx-docs-infra
       - publish-to-pypi
@@ -736,13 +665,11 @@
 - project:
     name: openstack-infra/logstash-filters
     templates:
-      - system-required
       - infra-logstash-filter-jobs
 
 - project:
     name: openstack-infra/lpmqtt
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
@@ -750,20 +677,17 @@
 - project:
     name: openstack-infra/meetbot
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/mqtt_statsd
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - publish-to-pypi
 
 - project:
     name: openstack-infra/nodepool
     templates:
-      - system-required
       - publish-to-pypi
     experimental:
       jobs:
@@ -776,7 +700,6 @@
 - project:
     name: openstack-infra/nose-html-output
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
     post:
@@ -786,25 +709,21 @@
 - project:
     name: openstack-infra/odsreg
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/openstack-zuul-jobs
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-infra
 
 - project:
     name: openstack-infra/openstack-zuul-roles
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/openstackid
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-infra
     check:
       jobs:
@@ -822,19 +741,15 @@
 - project:
     name: openstack-infra/openstackid-resources
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/openstackweb
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/os-loganalyze
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -849,8 +764,6 @@
 
 - project:
     name: openstack-infra/project-config
-    templates:
-      - system-required
     check:
       jobs:
         - build-openstack-specs-site
@@ -893,8 +806,6 @@
 
 - project:
     name: openstack-infra/project-config-example
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-linters
@@ -905,7 +816,6 @@
 - project:
     name: openstack-infra/publications
     templates:
-      - system-required
       - noop-jobs
     post:
       jobs:
@@ -922,7 +832,6 @@
 - project:
     name: openstack-infra/puppet-accessbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -933,7 +842,6 @@
 - project:
     name: openstack-infra/puppet-ansible
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -944,7 +852,6 @@
 - project:
     name: openstack-infra/puppet-apparmor
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -955,7 +862,6 @@
 - project:
     name: openstack-infra/puppet-askbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -966,7 +872,6 @@
 - project:
     name: openstack-infra/puppet-asterisk
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -977,7 +882,6 @@
 - project:
     name: openstack-infra/puppet-bandersnatch
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -988,7 +892,6 @@
 - project:
     name: openstack-infra/puppet-bugdaystats
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -999,7 +902,6 @@
 - project:
     name: openstack-infra/puppet-bup
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1010,7 +912,6 @@
 - project:
     name: openstack-infra/puppet-cgit
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1021,7 +922,6 @@
 - project:
     name: openstack-infra/puppet-ciwatch
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1032,7 +932,6 @@
 - project:
     name: openstack-infra/puppet-diskimage_builder
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1043,7 +942,6 @@
 - project:
     name: openstack-infra/puppet-docker_registry
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1054,7 +952,6 @@
 - project:
     name: openstack-infra/puppet-drupal
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1065,7 +962,6 @@
 - project:
     name: openstack-infra/puppet-elastic_recheck
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1076,7 +972,6 @@
 - project:
     name: openstack-infra/puppet-elasticsearch
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1087,7 +982,6 @@
 - project:
     name: openstack-infra/puppet-ethercalc
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1098,7 +992,6 @@
 - project:
     name: openstack-infra/puppet-etherpad_lite
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1109,7 +1002,6 @@
 - project:
     name: openstack-infra/puppet-exim
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1120,7 +1012,6 @@
 - project:
     name: openstack-infra/puppet-featuretracker
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1131,7 +1022,6 @@
 - project:
     name: openstack-infra/puppet-germqtt
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
     gate:
@@ -1140,7 +1030,6 @@
 - project:
     name: openstack-infra/puppet-gerrit
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1151,7 +1040,6 @@
 - project:
     name: openstack-infra/puppet-gerritbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1162,7 +1050,6 @@
 - project:
     name: openstack-infra/puppet-github
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1173,7 +1060,6 @@
 - project:
     name: openstack-infra/puppet-grafyaml
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1184,7 +1070,6 @@
 - project:
     name: openstack-infra/puppet-graphite
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1195,7 +1080,6 @@
 - project:
     name: openstack-infra/puppet-haveged
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1206,7 +1090,6 @@
 - project:
     name: openstack-infra/puppet-hound
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1217,7 +1100,6 @@
 - project:
     name: openstack-infra/puppet-httpd
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1231,7 +1113,6 @@
 - project:
     name: openstack-infra/puppet-infra-cookiecutter
     templates:
-      - system-required
       - noop-jobs
     gate:
       queue: system-config
@@ -1239,7 +1120,6 @@
 - project:
     name: openstack-infra/puppet-infracloud
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1250,7 +1130,6 @@
 - project:
     name: openstack-infra/puppet-ipsilon
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1261,7 +1140,6 @@
 - project:
     name: openstack-infra/puppet-iptables
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1272,7 +1150,6 @@
 - project:
     name: openstack-infra/puppet-jeepyb
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1283,7 +1160,6 @@
 - project:
     name: openstack-infra/puppet-jenkins
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1294,7 +1170,6 @@
 - project:
     name: openstack-infra/puppet-kerberos
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1305,7 +1180,6 @@
 - project:
     name: openstack-infra/puppet-kibana
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1316,7 +1190,6 @@
 - project:
     name: openstack-infra/puppet-lodgeit
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1327,7 +1200,6 @@
 - project:
     name: openstack-infra/puppet-log_processor
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1338,7 +1210,6 @@
 - project:
     name: openstack-infra/puppet-logrotate
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1348,7 +1219,6 @@
 - project:
     name: openstack-infra/puppet-logstash
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1359,7 +1229,6 @@
 - project:
     name: openstack-infra/puppet-lpmqtt
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
     gate:
@@ -1368,7 +1237,6 @@
 - project:
     name: openstack-infra/puppet-mailman
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1379,7 +1247,6 @@
 - project:
     name: openstack-infra/puppet-mediawiki
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1390,7 +1257,6 @@
 - project:
     name: openstack-infra/puppet-meetbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1401,7 +1267,6 @@
 - project:
     name: openstack-infra/puppet-mosquitto
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
     gate:
@@ -1410,7 +1275,6 @@
 - project:
     name: openstack-infra/puppet-mqtt_statsd
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
     gate:
@@ -1419,7 +1283,6 @@
 - project:
     name: openstack-infra/puppet-mysql_backup
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1430,7 +1293,6 @@
 - project:
     name: openstack-infra/puppet-nodepool
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1441,7 +1303,6 @@
 - project:
     name: openstack-infra/puppet-odsreg
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1452,7 +1313,6 @@
 - project:
     name: openstack-infra/puppet-openafs
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1463,7 +1323,6 @@
 - project:
     name: openstack-infra/puppet-openstack_health
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1473,8 +1332,6 @@
 
 - project:
     name: openstack-infra/puppet-openstack_infra_spec_helper
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-puppet-openstack-infra-spec-helper-unit-centos-7
@@ -1490,7 +1347,6 @@
 - project:
     name: openstack-infra/puppet-openstackci
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - publish-openstack-sphinx-docs-infra
@@ -1505,7 +1361,6 @@
 - project:
     name: openstack-infra/puppet-openstackid
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1516,7 +1371,6 @@
 - project:
     name: openstack-infra/puppet-os_client_config
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1527,7 +1381,6 @@
 - project:
     name: openstack-infra/puppet-packagekit
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1538,7 +1391,6 @@
 - project:
     name: openstack-infra/puppet-pgsql_backup
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1549,7 +1401,6 @@
 - project:
     name: openstack-infra/puppet-phabricator
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1560,7 +1411,6 @@
 - project:
     name: openstack-infra/puppet-pip
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1571,7 +1421,6 @@
 - project:
     name: openstack-infra/puppet-planet
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1582,7 +1431,6 @@
 - project:
     name: openstack-infra/puppet-project_config
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1593,7 +1441,6 @@
 - project:
     name: openstack-infra/puppet-ptgbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1604,7 +1451,6 @@
 - project:
     name: openstack-infra/puppet-puppet
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1615,7 +1461,6 @@
 - project:
     name: openstack-infra/puppet-redis
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1626,7 +1471,6 @@
 - project:
     name: openstack-infra/puppet-refstack
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
     gate:
@@ -1635,7 +1479,6 @@
 - project:
     name: openstack-infra/puppet-releasestatus
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1646,7 +1489,6 @@
 - project:
     name: openstack-infra/puppet-reviewday
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1657,7 +1499,6 @@
 - project:
     name: openstack-infra/puppet-simpleproxy
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1668,7 +1509,6 @@
 - project:
     name: openstack-infra/puppet-snmpd
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1679,7 +1519,6 @@
 - project:
     name: openstack-infra/puppet-ssh
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1690,7 +1529,6 @@
 - project:
     name: openstack-infra/puppet-ssl_cert_check
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1701,7 +1539,6 @@
 - project:
     name: openstack-infra/puppet-stackalytics
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1712,7 +1549,6 @@
 - project:
     name: openstack-infra/puppet-statusbot
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1723,7 +1559,6 @@
 - project:
     name: openstack-infra/puppet-storyboard
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1737,7 +1572,6 @@
 - project:
     name: openstack-infra/puppet-subunit2sql
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1748,7 +1582,6 @@
 - project:
     name: openstack-infra/puppet-sudoers
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1759,7 +1592,6 @@
 - project:
     name: openstack-infra/puppet-tmpreaper
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1770,7 +1602,6 @@
 - project:
     name: openstack-infra/puppet-translation_checksite
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1781,7 +1612,6 @@
 - project:
     name: openstack-infra/puppet-ulimit
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1792,7 +1622,6 @@
 - project:
     name: openstack-infra/puppet-unattended_upgrades
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1803,7 +1632,6 @@
 - project:
     name: openstack-infra/puppet-unbound
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1814,7 +1642,6 @@
 - project:
     name: openstack-infra/puppet-user
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1825,7 +1652,6 @@
 - project:
     name: openstack-infra/puppet-vcsrepo
     templates:
-      - system-required
       - noop-jobs
     gate:
       queue: system-config
@@ -1833,7 +1659,6 @@
 - project:
     name: openstack-infra/puppet-vinz
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - puppet-beaker-jobs-centos-7-infra
       - puppet-beaker-jobs-xenial-infra
@@ -1843,7 +1668,6 @@
 - project:
     name: openstack-infra/puppet-yum
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1854,7 +1678,6 @@
 - project:
     name: openstack-infra/puppet-zanata
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1865,7 +1688,6 @@
 - project:
     name: openstack-infra/puppet-zuul
     templates:
-      - system-required
       - infra-puppet-check-jobs
       - infra-puppet-apply-jobs
       - puppet-beaker-jobs-centos-7-infra
@@ -1876,7 +1698,6 @@
 - project:
     name: openstack-infra/pynotedb
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-openstack-sphinx-docs
@@ -1885,7 +1706,6 @@
 - project:
     name: openstack-infra/pypi-mirror
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -1900,7 +1720,6 @@
 - project:
     name: openstack-infra/python-storyboardclient
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-openstack-sphinx-docs-infra
@@ -1916,7 +1735,6 @@
 - project:
     name: openstack-infra/release-tools
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
     check:
@@ -1945,13 +1763,11 @@
 - project:
     name: openstack-infra/releasestatus
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/requestsexceptions
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -1964,7 +1780,6 @@
 - project:
     name: openstack-infra/reviewday
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -1979,7 +1794,6 @@
 - project:
     name: openstack-infra/reviewstats
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
@@ -1987,7 +1801,6 @@
 - project:
     name: openstack-infra/shade
     templates:
-      - system-required
       - openstack-python-jobs
       - release-notes-jobs
       - check-requirements
@@ -2004,7 +1817,6 @@
 - project:
     name: openstack-infra/statusbot
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -2019,7 +1831,6 @@
 - project:
     name: openstack-infra/storyboard
     templates:
-      - system-required
       - publish-to-pypi
       - publish-openstack-sphinx-docs-infra
     post:
@@ -2041,8 +1852,6 @@
 
 - project:
     name: openstack-infra/storyboard-webclient
-    templates:
-      - system-required
     post:
       jobs:
         - publish-openstack-javascript-content
@@ -2058,7 +1867,6 @@
 - project:
     name: openstack-infra/subunit2sql
     templates:
-      - system-required
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
       - release-notes-jobs
@@ -2068,7 +1876,6 @@
 - project:
     name: openstack-infra/system-config
     templates:
-      - system-required
       - infra-puppet-apply-jobs
       - infra-logstash-filter-jobs
       - publish-openstack-sphinx-docs-infra
@@ -2082,27 +1889,18 @@
         - tox-linters
         - legacy-system-config-puppet-syntax-3
 
-- project:
-    name: openstack-infra/tripleo-ci
-    templates:
-      - system-required
-
 - project:
     name: openstack-infra/trystack-site
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/vinz
     templates:
-      - system-required
       - nodejs4-jobs
 
 - project:
     name: openstack-infra/vinz-webclient
-    templates:
-      - system-required
     check:
       jobs:
         - build-javascript-content:
@@ -2120,7 +1918,6 @@
 - project:
     name: openstack-infra/yaml2ical
     templates:
-      - system-required
       - openstack-python35-jobs-no-constraints
       - publish-to-pypi
     check:
@@ -2132,8 +1929,6 @@
 
 - project:
     name: openstack-infra/zmq-event-publisher
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-zmq-event-publisher-maven-build-ubuntu-trusty
@@ -2150,15 +1945,9 @@
               - legacy-zmq-event-publisher-hpi-artifact
         - legacy-zmq-event-publisher-hpi-artifact
 
-- project:
-    name: openstack-infra/zone-zuul-ci.org
-    templates:
-      - system-required
-
 - project:
     name: openstack-infra/zuul
     templates:
-      - system-required
       - publish-to-pypi
     experimental:
       jobs:
@@ -2167,7 +1956,6 @@
 - project:
     name: openstack-infra/zuul-base-jobs
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-infra
     check:
       jobs:
@@ -2183,7 +1971,6 @@
 - project:
     name: openstack-infra/zuul-jobs
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-infra
     check:
       jobs:
@@ -2229,29 +2016,16 @@
 - project:
     name: openstack-infra/zuul-packaging
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack-infra/zuul-sphinx
     templates:
-      - system-required
       - publish-to-pypi
 
-- project:
-    name: openstack-infra/zuul-website
-    templates:
-      - system-required
-
-- project:
-    name: openstack-infra/zuul-website-media
-    templates:
-      - system-required
-
 - project:
     name: openstack/adjutant
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -2262,26 +2036,22 @@
 - project:
     name: openstack/adjutant-ui
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/aeromancer
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/ailuropoda
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-armada
     templates:
-      - system-required
       - openstack-python35-jobs
       - docs-on-readthedocs
     check:
@@ -2292,13 +2062,11 @@
 - project:
     name: openstack/airship-berth
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-deckhand
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
     check:
@@ -2309,49 +2077,41 @@
 - project:
     name: openstack/airship-divingbell
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-drydock
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-in-a-bottle
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-maas
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-pegleg
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-promenade
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/airship-shipyard
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/alexandria
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs-nonvoting
@@ -2359,7 +2119,6 @@
 - project:
     name: openstack/almanach
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -2375,7 +2134,6 @@
 - project:
     name: openstack/anchor
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-pypy-jobs-nonvoting
@@ -2386,7 +2144,6 @@
 - project:
     name: openstack/ansible-config_template
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2397,7 +2154,6 @@
 - project:
     name: openstack/ansible-hardening
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2409,27 +2165,19 @@
     name: openstack/ansible-role-ara
     templates:
       - noop-jobs
-      - system-required
 
 - project:
     name: openstack/ansible-role-bindep
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
       - docs-on-readthedocs
       - windmill-jobs-centos7-nv
 
-- project:
-    name: openstack/ansible-role-carbon
-    templates:
-      - system-required
-
 - project:
     name: openstack/ansible-role-cloud-launcher
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2438,7 +2186,6 @@
 - project:
     name: openstack/ansible-role-container-registry
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -2453,13 +2200,11 @@
 - project:
     name: openstack/ansible-role-diskimage-builder
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/ansible-role-fedmsg
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2471,24 +2216,16 @@
 - project:
     name: openstack/ansible-role-gearman
     templates:
-      - system-required
       - docs-on-readthedocs
 
-- project:
-    name: openstack/ansible-role-grafyaml
-    templates:
-      - system-required
-
 - project:
     name: openstack/ansible-role-jenkins
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-jenkins-job-builder
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2500,55 +2237,46 @@
 - project:
     name: openstack/ansible-role-jenkins-plugins
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-glance
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-keystone
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-mariadb
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-rabbitmq
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-k8s-tripleo
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ansible-role-logrotate
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2559,25 +2287,21 @@
 - project:
     name: openstack/ansible-role-nginx
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/ansible-role-nodepool
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/ansible-role-openstacksdk
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/ansible-role-python_venv_build
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2588,7 +2312,6 @@
 - project:
     name: openstack/ansible-role-qdrouterd
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2599,7 +2322,6 @@
 - project:
     name: openstack/ansible-role-redhat-subscription
     templates:
-      - system-required
       - release-openstack-server
     check:
       jobs:
@@ -2614,24 +2336,16 @@
 - project:
     name: openstack/ansible-role-shade
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/ansible-role-ssh
     templates:
-      - system-required
       - docs-on-readthedocs
 
-- project:
-    name: openstack/ansible-role-statsd
-    templates:
-      - system-required
-
 - project:
     name: openstack/ansible-role-sudoers
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2643,7 +2357,6 @@
 - project:
     name: openstack/ansible-role-systemd_mount
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2654,7 +2367,6 @@
 - project:
     name: openstack/ansible-role-systemd_networkd
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2665,7 +2377,6 @@
 - project:
     name: openstack/ansible-role-systemd_service
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -2676,13 +2387,11 @@
 - project:
     name: openstack/ansible-role-tripleo-keystone
     templates:
-        - system-required
-        - noop-jobs
+      - noop-jobs
 
 - project:
     name: openstack/ansible-role-tripleo-modify-image
     templates:
-      - system-required
       - release-openstack-server
     check:
       jobs:
@@ -2697,7 +2406,6 @@
 - project:
     name: openstack/ansible-role-virtualenv
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-centos7
       - ansible-role-functional-jobs-xenial
@@ -2706,15 +2414,9 @@
       - windmill-jobs-fedora-27
       - windmill-jobs-xenial
 
-- project:
-    name: openstack/ansible-role-whisper
-    templates:
-      - system-required
-
 - project:
     name: openstack/ansible-role-zookeeper
     templates:
-      - system-required
       - ansible-role-jobs
       - ansible-role-functional-jobs-xenial
       - docs-on-readthedocs
@@ -2729,13 +2431,11 @@
 - project:
     name: openstack/ansible-role-zuul
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/aodh
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -2747,13 +2447,11 @@
 - project:
     name: openstack/api-site
     templates:
-      - system-required
       - translation-jobs
 
 - project:
     name: openstack/api-wg
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -2765,21 +2463,18 @@
 - project:
     name: openstack/apmec
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/apmec-horizon
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/ara
     templates:
-      - system-required
       - publish-to-pypi-quietly
       - docs-on-readthedocs
     check:
@@ -2806,31 +2501,25 @@
 - project:
     name: openstack/ara-clients
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ara-plugins
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ara-server
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ara-web
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/arch-wg
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-py27
@@ -2841,7 +2530,6 @@
 - project:
     name: openstack/astara
     templates:
-      - system-required
       - docs-on-readthedocs
       - check-requirements
       - openstack-python-jobs
@@ -2857,7 +2545,6 @@
 - project:
     name: openstack/astara-appliance
     templates:
-      - system-required
       - docs-on-readthedocs
       - check-requirements
     check:
@@ -2877,7 +2564,6 @@
 - project:
     name: openstack/astara-horizon
     templates:
-      - system-required
       - docs-on-readthedocs
       - check-requirements
       - release-openstack-server
@@ -2895,7 +2581,6 @@
 - project:
     name: openstack/astara-neutron
     templates:
-      - system-required
       - docs-on-readthedocs
       - check-requirements
       - release-openstack-server
@@ -2914,7 +2599,6 @@
 - project:
     name: openstack/automaton
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -2927,13 +2611,11 @@
 - project:
     name: openstack/bansho
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/barbican
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - translation-jobs
@@ -2959,13 +2641,11 @@
 - project:
     name: openstack/barbican-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/barbican-tempest-plugin
     templates:
-      - system-required
       - tempest-plugin-jobs
       - check-requirements
     gate:
@@ -2974,7 +2654,6 @@
 - project:
     name: openstack/bareon
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -2983,7 +2662,6 @@
 - project:
     name: openstack/bareon-allocator
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -2992,7 +2670,6 @@
 - project:
     name: openstack/bareon-api
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -3001,13 +2678,11 @@
 - project:
     name: openstack/bareon-image-elements
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/bareon-ironic
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -3017,13 +2692,11 @@
     name: openstack/bareon-specs
     templates:
       - docs-on-readthedocs
-      - system-required
       - build-only-specs-jobs
 
 - project:
     name: openstack/bifrost
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-openstack-sphinx-docs
@@ -3033,7 +2706,6 @@
 - project:
     name: openstack/bilean
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -3042,7 +2714,6 @@
 - project:
     name: openstack/blazar
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -3060,7 +2731,6 @@
 - project:
     name: openstack/blazar-dashboard
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - check-requirements
       - openstack-python35-jobs-horizon
@@ -3071,7 +2741,6 @@
 - project:
     name: openstack/blazar-nova
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -3112,7 +2781,6 @@
 - project:
     name: openstack/blazar-tempest-plugin
     templates:
-      - system-required
       - tempest-plugin-jobs
       - check-requirements
     gate:
@@ -3121,32 +2789,27 @@
 - project:
     name: openstack/boartty
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/broadview-collector
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/broadview-lib
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/broadview-ui
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/browbeat
     templates:
-      - system-required
       - ansible-role-jobs
       - docs-on-readthedocs
     check:
@@ -3161,7 +2824,6 @@
 - project:
     name: openstack/castellan
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs-python3
@@ -3173,7 +2835,6 @@
 - project:
     name: openstack/castellan-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -3182,8 +2843,6 @@
 
 - project:
     name: openstack/cathead
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -3196,7 +2855,6 @@
 - project:
     name: openstack/ceilometer
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -3213,7 +2871,6 @@
 - project:
     name: openstack/ceilometer-powervm
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -3224,13 +2881,11 @@
 - project:
     name: openstack/ceilometer-zvm
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/ceilometermiddleware
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -3238,515 +2893,431 @@
       - lib-forward-testing-plugin
       - publish-to-pypi
 
-- project:
-    name: openstack/certbot-dns-openstack
-    templates:
-      - system-required
-
 - project:
     name: openstack/charm-6wind-virtual-accelerator
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-aodh
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-barbican
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-barbican-softhsm
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-ceilometer
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-ceilometer-agent
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-ceph
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-ceph-fs
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-ceph-mon
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-ceph-osd
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-ceph-proxy
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-ceph-radosgw
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-cinder
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-cinder-backup
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-cinder-ceph
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-cloudkitty
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-deployment-guide
     templates:
-      - system-required
       - deploy-guide-jobs
 
 - project:
     name: openstack/charm-designate
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-designate-bind
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-glance
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-glance-simplestreams-sync
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-glusterfs
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-gnocchi
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-guide
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
 
 - project:
     name: openstack/charm-hacluster
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-heat
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-interface-barbican-hsm
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-bgp
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-bind-rndc
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-ceph-client
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-ceph-mds
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-gnocchi
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-hacluster
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-keystone
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-keystone-admin
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-keystone-credentials
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-keystone-domain-backend
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-manila-plugin
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-mysql-shared
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-neutron-plugin
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-neutron-plugin-api-subordinate
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-odl-controller-api
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-openstack-ha
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-ovsdb-manager
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-rabbitmq
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-interface-service-control
     templates:
-      - system-required
       - python-charm-interface-jobs
 
 - project:
     name: openstack/charm-ironic
     templates:
-      - system-required
       - python-charm-jobs
 
 - project:
     name: openstack/charm-keystone
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-keystone-ldap
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-layer-ceph-base
     templates:
-      - system-required
       - python-charm-layer-jobs
 
 - project:
     name: openstack/charm-layer-openstack
     templates:
-      - system-required
       - python-charm-layer-jobs
 
 - project:
     name: openstack/charm-layer-openstack-api
     templates:
-      - system-required
       - python-charm-layer-jobs
 
 - project:
     name: openstack/charm-layer-openstack-principle
     templates:
-      - system-required
       - python-charm-layer-jobs
 
 - project:
     name: openstack/charm-lxd
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-manila
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-manila-generic
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-manila-glusterfs
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-mistral
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-murano
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-neutron-api
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-neutron-api-genericswitch
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-neutron-api-odl
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-neutron-api-plumgrid
     templates:
-      - system-required
       - python-charm-jobs
 
 - project:
     name: openstack/charm-neutron-dynamic-routing
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-neutron-gateway
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-neutron-openvswitch
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-nova-cloud-controller
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-nova-compute
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-nova-compute-proxy
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-odl-controller
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-openstack-dashboard
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-openvswitch-odl
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-panko
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-percona-cluster
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-plumgrid-director
     templates:
-      - system-required
       - python-charm-jobs
 
 - project:
     name: openstack/charm-plumgrid-edge
     templates:
-      - system-required
       - python-charm-jobs
 
 - project:
     name: openstack/charm-plumgrid-gateway
     templates:
-      - system-required
       - python-charm-jobs
 
 - project:
     name: openstack/charm-rabbitmq-server
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -3760,61 +3331,52 @@
 - project:
     name: openstack/charm-swift-proxy
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-swift-storage
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/charm-tempest
     templates:
-      - system-required
       - python35-charm-jobs
 
 - project:
     name: openstack/charm-trove
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charm-vault
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charms.ceph
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/charms.openstack
     templates:
-      - system-required
       - python-charm-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/ci-cd-pipeline-app-murano
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/cinder
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -4172,14 +3734,12 @@
 - project:
     name: openstack/cinder-fusioncompute
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/cinder-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -4191,7 +3751,6 @@
 - project:
     name: openstack/cinder-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -4200,20 +3759,13 @@
 - project:
     name: openstack/cisco-ironic-contrib
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
 
-- project:
-    name: openstack/cl-openstack-client
-    templates:
-      - system-required
-
 - project:
     name: openstack/cliff
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-pypy-jobs-nonvoting
@@ -4225,13 +3777,11 @@
 - project:
     name: openstack/cloud-init
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/cloudbase-init
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -4248,13 +3798,11 @@
 - project:
     name: openstack/cloudcafe
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/cloudkitty
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -4274,7 +3822,6 @@
 - project:
     name: openstack/cloudkitty-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -4284,13 +3831,11 @@
 - project:
     name: openstack/cloudkitty-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/cloudkitty-tempest-plugin
     templates:
-      - system-required
       - tempest-plugin-jobs
       - check-requirements
     gate:
@@ -4299,39 +3844,32 @@
 - project:
     name: openstack/cloudpulse
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/cloudroast
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/cognitive
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/collectd-openstack-plugins
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/compass-adapters
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/compass-core
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -4344,25 +3882,21 @@
 - project:
     name: openstack/compass-install
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/compass-specs
     templates:
-      - system-required
       - build-only-specs-jobs
 
 - project:
     name: openstack/compass-web
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/compute-hyperv
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -4371,7 +3905,6 @@
 - project:
     name: openstack/congress
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -4385,7 +3918,6 @@
 - project:
     name: openstack/congress-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -4396,7 +3928,6 @@
 - project:
     name: openstack/congress-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -4408,7 +3939,6 @@
 - project:
     name: openstack/congress-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - tempest-plugin-jobs
@@ -4418,7 +3948,6 @@
 - project:
     name: openstack/constellations
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
     check:
       jobs:
@@ -4430,7 +3959,6 @@
 - project:
     name: openstack/contributor-guide
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     check:
       jobs:
@@ -4445,109 +3973,33 @@
 - project:
     name: openstack/conveyor
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/cookbook-openstack-application-catalog
     templates:
-      - system-required
       - noop-jobs
 
-- project:
-    name: openstack/cookbook-openstack-block-storage
-    templates:
-      - system-required
-
 - project:
     name: openstack/cookbook-openstack-client
     templates:
-      - system-required
       - noop-jobs
 
-- project:
-    name: openstack/cookbook-openstack-common
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-compute
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-dashboard
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-dns
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-identity
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-image
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-integration-test
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-network
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-ops-database
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-ops-messaging
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-orchestration
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstack-telemetry
-    templates:
-      - system-required
-
-- project:
-    name: openstack/cookbook-openstackclient
-    templates:
-      - system-required
-
 - project:
     name: openstack/coreos-image-builder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/coupler
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/coverage2sql
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs
@@ -4561,7 +4013,6 @@
 - project:
     name: openstack/cursive
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -4570,7 +4021,6 @@
 - project:
     name: openstack/cyborg
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
@@ -4580,7 +4030,6 @@
 - project:
     name: openstack/cyborg-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -4592,19 +4041,16 @@
 - project:
     name: openstack/daisycloud-core
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/dash-stack
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/debtcollector
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -4617,7 +4063,6 @@
 - project:
     name: openstack/delimiter
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -4625,7 +4070,6 @@
 - project:
     name: openstack/designate
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -4650,7 +4094,6 @@
 - project:
     name: openstack/designate-dashboard
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
@@ -4677,7 +4120,6 @@
 - project:
     name: openstack/designate-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -4689,7 +4131,6 @@
 - project:
     name: openstack/designate-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -4700,13 +4141,10 @@
 - project:
     name: openstack/development-proposals
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/devstack-plugin-additional-pkg-repos
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4721,8 +4159,6 @@
 
 - project:
     name: openstack/devstack-plugin-amqp1
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4732,8 +4168,6 @@
 
 - project:
     name: openstack/devstack-plugin-bdd
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4748,8 +4182,6 @@
 
 - project:
     name: openstack/devstack-plugin-ceph
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4782,8 +4214,6 @@
 
 - project:
     name: openstack/devstack-plugin-container
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-devstack-plugin-container-dsvm:
@@ -4794,8 +4224,6 @@
 
 - project:
     name: openstack/devstack-plugin-glusterfs
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4839,8 +4267,6 @@
 
 - project:
     name: openstack/devstack-plugin-hdfs
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4864,8 +4290,6 @@
 
 - project:
     name: openstack/devstack-plugin-kafka
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4887,8 +4311,6 @@
 
 - project:
     name: openstack/devstack-plugin-libvirt-qemu
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4898,8 +4320,6 @@
 
 - project:
     name: openstack/devstack-plugin-mariadb
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4909,8 +4329,6 @@
 
 - project:
     name: openstack/devstack-plugin-nfs
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4926,8 +4344,6 @@
 
 - project:
     name: openstack/devstack-plugin-pika
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4937,8 +4353,6 @@
 
 - project:
     name: openstack/devstack-plugin-sheepdog
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4954,8 +4368,6 @@
 
 - project:
     name: openstack/devstack-plugin-tar-installer
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4965,8 +4377,6 @@
 
 - project:
     name: openstack/devstack-plugin-vmax
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4976,8 +4386,6 @@
 
 - project:
     name: openstack/devstack-plugin-zmq
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -4993,7 +4401,6 @@
 - project:
     name: openstack/devstack-tools
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -5001,7 +4408,6 @@
 - project:
     name: openstack/dib-utils
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -5017,7 +4423,6 @@
 - project:
     name: openstack/diskimage-builder
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -5049,7 +4454,6 @@
 - project:
     name: openstack/distil
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -5057,7 +4461,6 @@
 - project:
     name: openstack/distil-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -5065,7 +4468,6 @@
 - project:
     name: openstack/django_openstack_auth
     templates:
-      - system-required
       - translation-jobs-pike
       - publish-to-pypi
     check:
@@ -5156,7 +4558,6 @@
 - project:
     name: openstack/doc8
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -5164,13 +4565,11 @@
 - project:
     name: openstack/docker-machine-openstack
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/docs-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -5183,14 +4582,12 @@
     name: openstack/downpour
     templates:
       - noop-jobs
-      - system-required
       - docs-on-readthedocs
       - publish-to-pypi
 
 - project:
     name: openstack/dox
     templates:
-      - system-required
       - openstack-python35-jobs-nonvoting
       - publish-to-pypi
     check:
@@ -5207,7 +4604,6 @@
 - project:
     name: openstack/dragonflow
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-openstack-sphinx-docs
@@ -5258,8 +4654,6 @@
 
 - project:
     name: openstack/drbd-devstack
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -5276,7 +4670,6 @@
 - project:
     name: openstack/driverlog
     templates:
-      - system-required
       - openstack-python-jobs
     pre-release:
       jobs:
@@ -5290,7 +4683,6 @@
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - install-guide-jobs
@@ -5302,13 +4694,11 @@
 - project:
     name: openstack/ec2-driver
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ec2api-tempest-plugin
     templates:
-      - system-required
       - openstack-python-jobs
       - tempest-plugin-jobs
       - check-requirements
@@ -5318,7 +4708,6 @@
 - project:
     name: openstack/ekko
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -5326,14 +4715,13 @@
 - project:
     name: openstack/election
     templates:
-      - system-required
       - build-openstack-sphinx-docs
       - openstack-python35-jobs
     check:
       jobs:
         - openstack-tox-py27
         - openstack-tox-linters:
-           voting: false
+            voting: false
     post:
       jobs:
         - publish-static
@@ -5341,20 +4729,17 @@
 - project:
     name: openstack/enterprise-wg
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/entropy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
 
 - project:
     name: openstack/eslint-config-openstack
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-docs
       - publish-openstack-sphinx-docs
@@ -5363,7 +4748,6 @@
 - project:
     name: openstack/faafo
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
     check:
       jobs:
@@ -5381,7 +4765,6 @@
 - project:
     name: openstack/fixtures-git
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -5394,20 +4777,17 @@
 - project:
     name: openstack/flame
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/foxnut
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/freezer
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -5425,7 +4805,6 @@
 - project:
     name: openstack/freezer-api
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -5442,7 +4821,6 @@
 - project:
     name: openstack/freezer-dr
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -5458,7 +4836,6 @@
 - project:
     name: openstack/freezer-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -5470,7 +4847,6 @@
 - project:
     name: openstack/freezer-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -5479,7 +4855,6 @@
 - project:
     name: openstack/freezer-web-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -5496,7 +4871,6 @@
 - project:
     name: openstack/fuel-agent
     templates:
-      - system-required
       - openstack-python35-jobs
     check:
       jobs:
@@ -5525,8 +4899,6 @@
 
 - project:
     name: openstack/fuel-astute
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-fuel-astute-puppet-unit-3.8-centos-7
@@ -5537,7 +4909,6 @@
 - project:
     name: openstack/fuel-ccp
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
       - fuel-ccp-cross-repo-gate
@@ -5546,43 +4917,36 @@
 - project:
     name: openstack/fuel-ccp-ceph
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-ci-config
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-cinder
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-debian-base
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-designate
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-elasticsearch
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-entrypoint
     templates:
-      - system-required
       - openstack-python-jobs
       - fuel-ccp-cross-repo-gate
       - openstack-python35-jobs
@@ -5590,152 +4954,126 @@
 - project:
     name: openstack/fuel-ccp-etcd
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-galera
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-glance
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-grafana
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-heat
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-horizon
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-installer
     templates:
-      - system-required
       - noop-jobs
       - docs-on-readthedocs
 
 - project:
     name: openstack/fuel-ccp-ironic
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-keystone
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-mariadb
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-memcached
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-murano
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-neutron
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-nginx
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-nova
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-openstack-base
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-rabbitmq
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-rally
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-sahara
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-searchlight
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-specs
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-stacklight
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-ccp-tests
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/fuel-ccp-zmq
     templates:
-      - system-required
       - fuel-ccp-component
 
 - project:
     name: openstack/fuel-dev-tools
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -5748,7 +5086,6 @@
 - project:
     name: openstack/fuel-devops
     templates:
-      - system-required
       - openstack-python-jobs
     check:
       jobs:
@@ -5769,13 +5106,10 @@
 - project:
     name: openstack/fuel-docs
     templates:
-      - system-required
       - build-openstack-sphinx-docs
 
 - project:
     name: openstack/fuel-library
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-fuel-library-puppet-lint
@@ -5798,13 +5132,10 @@
 - project:
     name: openstack/fuel-main
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-menu
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8:
@@ -5833,7 +5164,6 @@
 - project:
     name: openstack/fuel-mirror
     templates:
-      - system-required
       - openstack-python35-jobs
     check:
       jobs:
@@ -5862,8 +5192,6 @@
 
 - project:
     name: openstack/fuel-nailgun-agent
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-fuel-nailgun-agent-puppet-unit-3.8-centos-7
@@ -5873,8 +5201,6 @@
 
 - project:
     name: openstack/fuel-nailgun-extension-cluster-upgrade
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -5886,8 +5212,6 @@
 
 - project:
     name: openstack/fuel-nailgun-extension-converted-serializers
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -5899,8 +5223,6 @@
 
 - project:
     name: openstack/fuel-nailgun-extension-iac
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -5913,14 +5235,11 @@
 - project:
     name: openstack/fuel-noop-fixtures
     templates:
-      - system-required
       - docs-on-readthedocs
       - build-openstack-sphinx-docs
 
 - project:
     name: openstack/fuel-octane
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8:
@@ -5967,8 +5286,6 @@
 
 - project:
     name: openstack/fuel-ostf
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8:
@@ -5991,589 +5308,491 @@
 - project:
     name: openstack/fuel-plugin-6wind-virtual-accelerator
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-astara
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-availability-zones
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-bgpvpn
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-bigswitch
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-block-device
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-calamari
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-calico
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ceilometer-redis
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ceph-multibackend
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ci
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-cinder-gcs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-cinder-kaminario
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-cinder-netapp
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-cisco-aci
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-congress
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-contrail
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-datera-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-dbaas-trove
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-debug
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-designate
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-database
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-haproxy
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-horizon
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-keystone
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-netnode
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-rabbitmq
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-detach-swift
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-dns-updater
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-dynatrace
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-elasticsearch-kibana
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-emailnotifyd
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-external-emc
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-external-glusterfs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-external-lb
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-external-zabbix
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-fortinet
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-glance-nfs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-gluon
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ha-fencing
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-hedvig-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-influxdb-grafana
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-inkscope
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ironic
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-kafka
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ldap
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ldap-slaves
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-lma-collector
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-lma-infrastructure-alerting
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-manila
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-mellanox
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-midonet
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-mistral
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-murano
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-murano-networking-sfc
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-murano-tests
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-network-node
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-networking-sfc
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-neutron-fwaas
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-neutron-lbaas
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-neutron-vpnaas
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nimblestorage-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nitrous
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nova-nfs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nsx-t
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nsxv
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-nuage
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-onos
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-openbook
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-opendaylight
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-openstack-telemetry
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-ovs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-plumgrid
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-purestorage-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-qemu
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-qlogic-sriov-vxlan
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-rally
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-saltstack
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-scaleio
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-scaleio-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-sensu
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-solidfire-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-swiftstack
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-tacker
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-tempest
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-tintri-cinder
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-tls
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-unity
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-vmware-dvs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-vxlan
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-watcher
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-wstunnel
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-xenserver
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-zabbix-agents
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-zabbix-monitoring-emc
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-zabbix-monitoring-extreme-networks
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugin-zabbix-snmptrapd
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-plugins
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -6586,8 +5805,6 @@
 
 - project:
     name: openstack/fuel-qa
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-py27:
@@ -6620,7 +5837,6 @@
 - project:
     name: openstack/fuel-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -6631,8 +5847,6 @@
 
 - project:
     name: openstack/fuel-stats
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -6644,8 +5858,6 @@
 
 - project:
     name: openstack/fuel-ui
-    templates:
-      - system-required
     check:
       jobs:
         - nodejs-npm-run-lint:
@@ -6660,13 +5872,10 @@
 - project:
     name: openstack/fuel-virtualbox
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/fuel-web
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8:
@@ -6701,7 +5910,6 @@
 - project:
     name: openstack/futurist
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -6714,7 +5922,6 @@
 - project:
     name: openstack/fuxi
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -6733,13 +5940,11 @@
 - project:
     name: openstack/fuxi-golang
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/fuxi-kubernetes
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -6747,14 +5952,12 @@
 - project:
     name: openstack/gantt
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/gce-api
     templates:
       - openstack-python-jobs
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -6765,7 +5968,6 @@
 - project:
     name: openstack/gerrit-dash-creator
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -6777,14 +5979,12 @@
 - project:
     name: openstack/gertty
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/giftwrap
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -6792,7 +5992,6 @@
 - project:
     name: openstack/git-nit
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -6800,13 +5999,11 @@
 - project:
     name: openstack/git-repo-manifests
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/git-upstream
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -6819,7 +6016,6 @@
 - project:
     name: openstack/glance
     templates:
-      - system-required
       - openstack-python35-jobs
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
@@ -6920,7 +6116,6 @@
 - project:
     name: openstack/glance-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -6932,7 +6127,6 @@
 - project:
     name: openstack/glance_store
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -6960,7 +6154,6 @@
 - project:
     name: openstack/glare
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -6975,7 +6168,6 @@
 - project:
     name: openstack/glare-specs
     templates:
-      - system-required
       - build-only-specs-jobs
     check:
       jobs:
@@ -6987,7 +6179,6 @@
 - project:
     name: openstack/gluon
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -6995,7 +6186,6 @@
 - project:
     name: openstack/goal-tools
     templates:
-      - system-required
       - openstack-python35-jobs
     check:
       jobs:
@@ -7007,25 +6197,21 @@
 - project:
     name: openstack/golang-client
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/golang-commons
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/gos-brick
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/governance
     templates:
-      - system-required
       - build-openstack-sphinx-docs-python3
     check:
       jobs:
@@ -7043,7 +6229,6 @@
 - project:
     name: openstack/governance-sigs
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -7052,7 +6237,6 @@
 - project:
     name: openstack/governance-uc
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -7061,7 +6245,6 @@
 - project:
     name: openstack/governance-website
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -7070,7 +6253,6 @@
 - project:
     name: openstack/group-based-policy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python-jobs-trusty
       - publish-to-pypi
@@ -7101,15 +6283,12 @@
 - project:
     name: openstack/group-based-policy-automation
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python-jobs-trusty
       - publish-to-pypi
 
 - project:
     name: openstack/group-based-policy-specs
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-py27:
@@ -7126,7 +6305,6 @@
 - project:
     name: openstack/group-based-policy-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python-jobs-trusty
       - publish-to-pypi
@@ -7134,7 +6312,6 @@
 - project:
     name: openstack/heat
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7156,7 +6333,6 @@
 - project:
     name: openstack/heat-agents
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7167,7 +6343,6 @@
 - project:
     name: openstack/heat-cfntools
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python35-jobs
@@ -7177,7 +6352,6 @@
 - project:
     name: openstack/heat-dashboard
     templates:
-      - system-required
       - translation-jobs
       - translation-jobs-queens
       - check-requirements
@@ -7191,7 +6365,6 @@
 - project:
     name: openstack/heat-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -7203,7 +6376,6 @@
 - project:
     name: openstack/heat-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - tempest-plugin-jobs
@@ -7213,13 +6385,11 @@
 - project:
     name: openstack/heat-templates
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/heat-translator
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7232,7 +6402,6 @@
 - project:
     name: openstack/horizon
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7250,19 +6419,16 @@
 - project:
     name: openstack/horizon-mellanox
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/hurricane
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/i18n
     templates:
-      - system-required
       - translation-jobs
       - check-requirements
     check:
@@ -7278,7 +6444,6 @@
 - project:
     name: openstack/i18n-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -7289,8 +6454,6 @@
 
 - project:
     name: openstack/inception
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -7301,7 +6464,6 @@
 - project:
     name: openstack/instack
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
       - check-requirements
@@ -7313,7 +6475,6 @@
 - project:
     name: openstack/instack-undercloud
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -7326,8 +6487,6 @@
 
 - project:
     name: openstack/intel-nfv-ci-tests
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -7338,7 +6497,6 @@
 - project:
     name: openstack/interop
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     check:
       jobs:
@@ -7350,13 +6508,11 @@
 - project:
     name: openstack/interop-workloads
     templates:
-      - system-required
       - build-openstack-sphinx-docs
 
 - project:
     name: openstack/iotronic
     templates:
-      - system-required
       - openstack-python35-jobs
       - check-requirements
       - publish-to-pypi
@@ -7370,7 +6526,6 @@
 - project:
     name: openstack/iotronic-lightning-rod
     templates:
-      - system-required
       - openstack-python35-jobs
       - check-requirements
       - publish-to-pypi
@@ -7384,15 +6539,12 @@
 - project:
     name: openstack/iotronic-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - check-requirements
       - publish-to-pypi-horizon
 
 - project:
     name: openstack/ipa-example-hardware-managers
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -7403,7 +6555,6 @@
 - project:
     name: openstack/ironic
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7430,7 +6581,6 @@
 - project:
     name: openstack/ironic-inspector
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7450,7 +6600,6 @@
 - project:
     name: openstack/ironic-inspector-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -7462,7 +6611,6 @@
 - project:
     name: openstack/ironic-lib
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7478,7 +6626,6 @@
 - project:
     name: openstack/ironic-python-agent
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7489,7 +6636,6 @@
 - project:
     name: openstack/ironic-python-agent-builder
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - check-requirements
       - release-notes-jobs
@@ -7507,7 +6653,6 @@
 - project:
     name: openstack/ironic-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -7519,7 +6664,6 @@
 - project:
     name: openstack/ironic-staging-drivers
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7529,7 +6673,6 @@
 - project:
     name: openstack/ironic-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -7541,7 +6684,6 @@
     name: openstack/ironic-ui
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - nodejs4-jobs
@@ -7555,20 +6697,17 @@
 - project:
     name: openstack/jacket
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/jenkins-plugins-for-murano
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/js-openstack-lib
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs6-jobs
       - nodejs6-docs
@@ -7593,13 +6732,11 @@
 - project:
     name: openstack/k8s-cloud-provider
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/k8s-docker-suite-app-murano
     templates:
-      - system-required
       - docs-on-readthedocs
       - build-openstack-sphinx-docs
     check:
@@ -7612,7 +6749,6 @@
 - project:
     name: openstack/karbor
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7629,7 +6765,6 @@
 - project:
     name: openstack/karbor-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7640,24 +6775,12 @@
 - project:
     name: openstack/karma-subunit-reporter
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
-- project:
-    name: openstack/kayobe
-    templates:
-      - system-required
-
-- project:
-    name: openstack/kayobe-config
-    templates:
-      - system-required
-
 - project:
     name: openstack/keystone
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7767,7 +6890,6 @@
 - project:
     name: openstack/keystone-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -7779,7 +6901,6 @@
 - project:
     name: openstack/keystone-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     check:
@@ -7798,7 +6919,6 @@
 - project:
     name: openstack/keystoneauth
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7810,7 +6930,6 @@
 - project:
     name: openstack/keystonemiddleware
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7826,7 +6945,6 @@
 - project:
     name: openstack/kiloeyes
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -7843,7 +6961,6 @@
 - project:
     name: openstack/kingbird
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -7856,7 +6973,6 @@
 - project:
     name: openstack/kingbird-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -7865,7 +6981,6 @@
 - project:
     name: openstack/kloudbuster
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
       - publish-to-pypi
@@ -7873,7 +6988,6 @@
 - project:
     name: openstack/kolla
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7885,7 +6999,6 @@
 - project:
     name: openstack/kolla-ansible
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -7894,29 +7007,21 @@
       - deploy-guide-jobs
       - publish-to-pypi
 
-- project:
-    name: openstack/kolla-cli
-    templates:
-      - system-required
-
 - project:
     name: openstack/kosmos
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/kosmos-specs
     templates:
-      - system-required
       - build-only-specs-jobs
 
 - project:
     name: openstack/kuryr
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs
@@ -7933,7 +7038,6 @@
 - project:
     name: openstack/kuryr-kubernetes
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -7944,7 +7048,6 @@
 - project:
     name: openstack/kuryr-libnetwork
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs
@@ -7959,7 +7062,6 @@
 - project:
     name: openstack/kuryr-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -7969,8 +7071,6 @@
 
 - project:
     name: openstack/kwapi
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -7982,25 +7082,13 @@
     name: openstack/ldappool
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
-- project:
-    name: openstack/liberasurecode
-    templates:
-      - system-required
-
-- project:
-    name: openstack/loci
-    templates:
-      - system-required
-
 - project:
     name: openstack/magnum
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8021,13 +7109,11 @@
 - project:
     name: openstack/magnum-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/magnum-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -8036,7 +7122,6 @@
 - project:
     name: openstack/magnum-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - check-requirements
@@ -8073,7 +7158,6 @@
 - project:
     name: openstack/manila
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8100,7 +7184,6 @@
 - project:
     name: openstack/manila-image-elements
     templates:
-      - system-required
       - check-requirements
       - build-openstack-sphinx-docs
     check:
@@ -8133,7 +7216,6 @@
 - project:
     name: openstack/manila-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -8145,7 +7227,6 @@
 - project:
     name: openstack/manila-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -8153,8 +7234,6 @@
 
 - project:
     name: openstack/manila-test-image
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -8169,7 +7248,6 @@
     name: openstack/manila-ui
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -8195,14 +7273,12 @@
 - project:
     name: openstack/marshal
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/masakari
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -8214,7 +7290,6 @@
 - project:
     name: openstack/masakari-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -8222,7 +7297,6 @@
 - project:
     name: openstack/masakari-monitors
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -8231,19 +7305,16 @@
 - project:
     name: openstack/masakari-specs
     templates:
-      - system-required
       - build-only-specs-jobs
 
 - project:
     name: openstack/meghdwar
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/merlin
     templates:
-      - system-required
       - nodejs4-jobs
     post:
       jobs:
@@ -8255,7 +7326,6 @@
 - project:
     name: openstack/metalsmith
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8264,20 +7334,17 @@
 - project:
     name: openstack/meteos
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/meteos-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/microversion-parse
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8286,7 +7353,6 @@
 - project:
     name: openstack/mistral
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -8299,7 +7365,6 @@
 - project:
     name: openstack/mistral-dashboard
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -8308,7 +7373,6 @@
 - project:
     name: openstack/mistral-extra
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8317,7 +7381,6 @@
 - project:
     name: openstack/mistral-lib
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8326,7 +7389,6 @@
 - project:
     name: openstack/mistral-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -8338,7 +7400,6 @@
 - project:
     name: openstack/mistral-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -8347,7 +7408,6 @@
 - project:
     name: openstack/mitmstack
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8356,7 +7416,6 @@
 - project:
     name: openstack/mixmatch
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -8365,7 +7424,6 @@
 - project:
     name: openstack/mogan
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -8377,7 +7435,6 @@
 - project:
     name: openstack/mogan-specs
     templates:
-      - system-required
       - build-only-specs-jobs
     check:
       jobs:
@@ -8389,7 +7446,6 @@
 - project:
     name: openstack/mogan-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -8397,7 +7453,6 @@
 - project:
     name: openstack/molteniron
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8406,7 +7461,6 @@
 - project:
     name: openstack/monasca-agent
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - publish-to-pypi
@@ -8414,7 +7468,6 @@
 - project:
     name: openstack/monasca-analytics
     templates:
-      - system-required
       - openstack-python35-jobs-nonvoting
       - check-requirements
       - publish-to-pypi
@@ -8430,7 +7483,6 @@
 - project:
     name: openstack/monasca-api
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -8459,7 +7511,6 @@
 - project:
     name: openstack/monasca-ceilometer
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -8467,7 +7518,6 @@
 - project:
     name: openstack/monasca-common
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8486,7 +7536,6 @@
 - project:
     name: openstack/monasca-events-api
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - periodic-jobs-with-oslo-master
@@ -8507,21 +7556,18 @@
 - project:
     name: openstack/monasca-grafana-datasource
     templates:
-      - system-required
       - nodejs4-publish-to-npm
       - noop-jobs
 
 - project:
     name: openstack/monasca-kibana-plugin
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
 - project:
     name: openstack/monasca-log-api
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - periodic-jobs-with-oslo-master
@@ -8543,7 +7589,6 @@
 - project:
     name: openstack/monasca-notification
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8558,7 +7603,6 @@
 - project:
     name: openstack/monasca-persister
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8578,13 +7622,11 @@
 - project:
     name: openstack/monasca-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/monasca-statsd
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8599,7 +7641,6 @@
 - project:
     name: openstack/monasca-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - tempest-plugin-jobs
@@ -8608,8 +7649,6 @@
 
 - project:
     name: openstack/monasca-thresh
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-monasca-thresh-maven-build
@@ -8623,7 +7662,6 @@
 - project:
     name: openstack/monasca-transform
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8650,7 +7688,6 @@
 - project:
     name: openstack/monasca-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - translation-jobs
       - translation-jobs-queens
@@ -8680,13 +7717,11 @@
 - project:
     name: openstack/monasca-vagrant
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/monitorstack
     templates:
-      - system-required
       - check-requirements
       - ansible-role-jobs
       - ansible-role-functional-jobs-xenial
@@ -8702,13 +7737,11 @@
 - project:
     name: openstack/mors
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/mox3
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -8719,7 +7752,6 @@
 - project:
     name: openstack/murano
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -8760,7 +7792,6 @@
 - project:
     name: openstack/murano-agent
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8769,8 +7800,6 @@
 
 - project:
     name: openstack/murano-apps
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-linters:
@@ -8782,7 +7811,6 @@
 - project:
     name: openstack/murano-dashboard
     templates:
-      - system-required
       - check-requirements
       - release-notes-jobs
       - openstack-python-jobs-horizon
@@ -8810,14 +7838,12 @@
 - project:
     name: openstack/murano-deployment
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/murano-pkg-check
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - translation-jobs
@@ -8830,20 +7856,17 @@
 - project:
     name: openstack/murano-plugin-networking-sfc
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/murano-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/murano-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -8852,13 +7875,11 @@
 - project:
     name: openstack/namos
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/nemesis
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -8867,7 +7888,6 @@
 - project:
     name: openstack/nerd-reviewer
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -8879,7 +7899,6 @@
 - project:
     name: openstack/network-checker
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -8893,20 +7912,17 @@
 - project:
     name: openstack/networking-6wind
     templates:
-      - system-required
       - openstack-python-jobs-neutron
 
 - project:
     name: openstack/networking-ale-omniswitch
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-ansible
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - build-openstack-sphinx-docs
@@ -8923,7 +7939,6 @@
 - project:
     name: openstack/networking-arista
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-to-pypi
@@ -8941,13 +7956,11 @@
 - project:
     name: openstack/networking-avaya
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/networking-bagpipe
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - publish-openstack-sphinx-docs
@@ -9074,7 +8087,6 @@
 - project:
     name: openstack/networking-baremetal
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - publish-openstack-sphinx-docs
@@ -9085,7 +8097,6 @@
 - project:
     name: openstack/networking-bgpvpn
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - publish-openstack-sphinx-docs
@@ -9206,7 +8217,6 @@
 - project:
     name: openstack/networking-bigswitch
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python-jobs-trusty
       - publish-to-pypi
@@ -9214,13 +8224,11 @@
 - project:
     name: openstack/networking-brocade
     templates:
-      - system-required
       - openstack-python-jobs-neutron
 
 - project:
     name: openstack/networking-calico
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9229,7 +8237,6 @@
 - project:
     name: openstack/networking-cisco
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - docs-on-readthedocs
@@ -9285,7 +8292,6 @@
 - project:
     name: openstack/networking-cumulus
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9294,7 +8300,6 @@
 - project:
     name: openstack/networking-dpm
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9314,20 +8319,17 @@
 - project:
     name: openstack/networking-edge-vpn
     templates:
-      - system-required
       - openstack-python-jobs-neutron
 
 - project:
     name: openstack/networking-extreme
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
 
 - project:
     name: openstack/networking-fortinet
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9336,7 +8338,6 @@
 - project:
     name: openstack/networking-fujitsu
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9345,7 +8346,6 @@
 - project:
     name: openstack/networking-generic-switch
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9358,7 +8358,6 @@
 - project:
     name: openstack/networking-generic-switch-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - tempest-plugin-jobs
@@ -9368,14 +8367,12 @@
 - project:
     name: openstack/networking-gluon
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
 
 - project:
     name: openstack/networking-h3c
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9384,7 +8381,6 @@
 - project:
     name: openstack/networking-hpe
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9393,7 +8389,6 @@
 - project:
     name: openstack/networking-huawei
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -9402,7 +8397,6 @@
 - project:
     name: openstack/networking-hyperv
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -9412,21 +8406,18 @@
 - project:
     name: openstack/networking-icc
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-infoblox
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-l2gw
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -9438,7 +8429,6 @@
 - project:
     name: openstack/networking-l2gw-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -9447,7 +8437,6 @@
 - project:
     name: openstack/networking-lagopus
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-to-pypi
@@ -9455,14 +8444,12 @@
 - project:
     name: openstack/networking-lenovo
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-midonet
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -9635,20 +8622,17 @@
 - project:
     name: openstack/networking-mlnx
     templates:
-      - system-required
       - openstack-python-jobs-neutron
 
 - project:
     name: openstack/networking-nec
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
 
 - project:
     name: openstack/networking-odl
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - release-notes-jobs
@@ -9827,7 +8811,6 @@
     name: openstack/networking-onos
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
     check:
@@ -9856,14 +8839,12 @@
     name: openstack/networking-opencontrail
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-ovn
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -9889,7 +8870,6 @@
 - project:
     name: openstack/networking-ovs-dpdk
     templates:
-      - system-required
       - openstack-python-jobs-neutron
     experimental:
       jobs:
@@ -9901,21 +8881,18 @@
 - project:
     name: openstack/networking-peregrine
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-plumgrid
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-powervm
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -9926,7 +8903,6 @@
 - project:
     name: openstack/networking-sfc
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-openstack-sphinx-docs
       - check-requirements
@@ -9938,7 +8914,6 @@
 - project:
     name: openstack/networking-spp
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
       - publish-to-pypi-neutron
@@ -9946,7 +8921,6 @@
 - project:
     name: openstack/networking-vpp
     templates:
-      - system-required
       - openstack-python-jobs-neutron
     check:
       jobs:
@@ -9956,7 +8930,6 @@
 - project:
     name: openstack/networking-vsphere
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - publish-to-pypi
@@ -9964,20 +8937,17 @@
 - project:
     name: openstack/networking-zte
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - publish-to-pypi
 
 - project:
     name: openstack/networking-zvm
     templates:
-      - system-required
       - openstack-python-jobs-neutron
 
 - project:
     name: openstack/neutron
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -10188,7 +9158,6 @@
 - project:
     name: openstack/neutron-classifier
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
@@ -10197,7 +9166,6 @@
     name: openstack/neutron-dynamic-routing
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - publish-openstack-sphinx-docs
@@ -10217,7 +9185,6 @@
     name: openstack/neutron-fwaas
     templates:
       - check-requirements
-      - system-required
       - periodic-stable-jobs-neutron
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -10256,7 +9223,6 @@
     name: openstack/neutron-fwaas-dashboard
     templates:
       - check-requirements
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
@@ -10269,7 +9235,6 @@
     name: openstack/neutron-lbaas
     templates:
       - check-requirements
-      - system-required
       - periodic-stable-jobs-neutron
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -10281,7 +9246,6 @@
     name: openstack/neutron-lbaas-dashboard
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-horizon
       - publish-openstack-sphinx-docs
       - translation-jobs
@@ -10312,12 +9276,10 @@
             required-projects:
               - openstack/horizon
 
-
 - project:
     name: openstack/neutron-lib
     templates:
       - check-requirements
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -10334,7 +9296,6 @@
 - project:
     name: openstack/neutron-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -10346,7 +9307,6 @@
 - project:
     name: openstack/neutron-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -10356,7 +9316,6 @@
     name: openstack/neutron-vpnaas
     templates:
       - check-requirements
-      - system-required
       - periodic-stable-jobs-neutron
       - periodic-jobs-with-neutron-lib-master
       - openstack-python-jobs-neutron
@@ -10375,7 +9334,6 @@
     name: openstack/neutron-vpnaas-dashboard
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -10387,13 +9345,11 @@
 - project:
     name: openstack/nfv-filters
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/nova
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - periodic-jobs-with-oslo-master
@@ -10795,7 +9751,6 @@
 - project:
     name: openstack/nova-dpm
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -10813,14 +9768,12 @@
 - project:
     name: openstack/nova-fusioncompute
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
 
 - project:
     name: openstack/nova-lxd
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -10847,7 +9800,6 @@
 - project:
     name: openstack/nova-mksproxy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -10855,7 +9807,6 @@
 - project:
     name: openstack/nova-powervm
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -10866,14 +9817,12 @@
 - project:
     name: openstack/nova-solver-scheduler
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/nova-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -10885,13 +9834,11 @@
 - project:
     name: openstack/nova-zvm-virt-driver
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/novajoin
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -10902,7 +9849,6 @@
 - project:
     name: openstack/novajoin-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -10911,7 +9857,6 @@
 - project:
     name: openstack/oaktree
     templates:
-      - system-required
       - publish-to-pypi-quietly
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -10920,8 +9865,6 @@
 
 - project:
     name: openstack/oaktreemodel
-    templates:
-      - system-required
     gate:
       queue: oaktree
 
@@ -10929,7 +9872,6 @@
     name: openstack/octavia
     templates:
       - check-requirements
-      - system-required
       - periodic-stable-jobs-neutron
       - periodic-jobs-with-oslo-master
       - openstack-python-jobs
@@ -10952,7 +9894,6 @@
     name: openstack/octavia-dashboard
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -10988,7 +9929,6 @@
 - project:
     name: openstack/octavia-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -10998,8 +9938,6 @@
 
 - project:
     name: openstack/omni
-    templates:
-      - system-required
     check:
       jobs:
         - legacy-omni-tests
@@ -11011,7 +9949,6 @@
     name: openstack/ooi
     templates:
       - docs-on-readthedocs
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -11024,8 +9961,6 @@
 
 - project:
     name: openstack/opencafe
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -11036,13 +9971,11 @@
 - project:
     name: openstack/openstack
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/openstack-ansible
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - deploy-guide-jobs
@@ -11055,7 +9988,6 @@
 - project:
     name: openstack/openstack-ansible-apt_package_pinning
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11063,7 +9995,6 @@
 - project:
     name: openstack/openstack-ansible-ceph_client
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11071,7 +10002,6 @@
 - project:
     name: openstack/openstack-ansible-galera_client
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11079,7 +10009,6 @@
 - project:
     name: openstack/openstack-ansible-galera_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11090,7 +10019,6 @@
 - project:
     name: openstack/openstack-ansible-haproxy_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11101,7 +10029,6 @@
 - project:
     name: openstack/openstack-ansible-lxc_container_create
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11109,7 +10036,6 @@
 - project:
     name: openstack/openstack-ansible-lxc_hosts
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11117,7 +10043,6 @@
 - project:
     name: openstack/openstack-ansible-memcached_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11128,7 +10053,6 @@
 - project:
     name: openstack/openstack-ansible-nspawn_container_create
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11139,7 +10063,6 @@
 - project:
     name: openstack/openstack-ansible-nspawn_hosts
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11150,7 +10073,6 @@
 - project:
     name: openstack/openstack-ansible-openstack_hosts
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11158,7 +10080,6 @@
 - project:
     name: openstack/openstack-ansible-openstack_openrc
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11166,7 +10087,6 @@
 - project:
     name: openstack/openstack-ansible-ops
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11174,7 +10094,6 @@
 - project:
     name: openstack/openstack-ansible-os_almanach
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11185,7 +10104,6 @@
 - project:
     name: openstack/openstack-ansible-os_aodh
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11196,7 +10114,6 @@
 - project:
     name: openstack/openstack-ansible-os_barbican
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11207,7 +10124,6 @@
 - project:
     name: openstack/openstack-ansible-os_blazar
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11218,7 +10134,6 @@
 - project:
     name: openstack/openstack-ansible-os_ceilometer
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11229,7 +10144,6 @@
 - project:
     name: openstack/openstack-ansible-os_cinder
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11240,7 +10154,6 @@
 - project:
     name: openstack/openstack-ansible-os_cloudkitty
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11251,7 +10164,6 @@
 - project:
     name: openstack/openstack-ansible-os_congress
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11259,7 +10171,6 @@
 - project:
     name: openstack/openstack-ansible-os_designate
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11270,7 +10181,6 @@
 - project:
     name: openstack/openstack-ansible-os_glance
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11281,7 +10191,6 @@
 - project:
     name: openstack/openstack-ansible-os_gnocchi
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11292,7 +10201,6 @@
 - project:
     name: openstack/openstack-ansible-os_heat
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11303,7 +10211,6 @@
 - project:
     name: openstack/openstack-ansible-os_horizon
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11314,7 +10221,6 @@
 - project:
     name: openstack/openstack-ansible-os_ironic
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11325,7 +10231,6 @@
 - project:
     name: openstack/openstack-ansible-os_karbor
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11333,7 +10238,6 @@
 - project:
     name: openstack/openstack-ansible-os_keystone
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11344,7 +10248,6 @@
 - project:
     name: openstack/openstack-ansible-os_magnum
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11355,7 +10258,6 @@
 - project:
     name: openstack/openstack-ansible-os_masakari
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11366,7 +10268,6 @@
 - project:
     name: openstack/openstack-ansible-os_molteniron
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11374,7 +10275,6 @@
 - project:
     name: openstack/openstack-ansible-os_monasca
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11385,7 +10285,6 @@
 - project:
     name: openstack/openstack-ansible-os_monasca-agent
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11393,7 +10292,6 @@
 - project:
     name: openstack/openstack-ansible-os_monasca-ui
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11401,7 +10299,6 @@
 - project:
     name: openstack/openstack-ansible-os_neutron
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11412,7 +10309,6 @@
 - project:
     name: openstack/openstack-ansible-os_nova
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11423,7 +10319,6 @@
 - project:
     name: openstack/openstack-ansible-os_octavia
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11431,7 +10326,6 @@
 - project:
     name: openstack/openstack-ansible-os_panko
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11442,7 +10336,6 @@
 - project:
     name: openstack/openstack-ansible-os_rally
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11453,7 +10346,6 @@
 - project:
     name: openstack/openstack-ansible-os_sahara
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11464,7 +10356,6 @@
 - project:
     name: openstack/openstack-ansible-os_searchlight
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11472,7 +10363,6 @@
 - project:
     name: openstack/openstack-ansible-os_swift
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11483,7 +10373,6 @@
 - project:
     name: openstack/openstack-ansible-os_tacker
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11491,7 +10380,6 @@
 - project:
     name: openstack/openstack-ansible-os_tempest
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11499,7 +10387,6 @@
 - project:
     name: openstack/openstack-ansible-os_trove
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11510,7 +10397,6 @@
 - project:
     name: openstack/openstack-ansible-os_watcher
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11521,7 +10407,6 @@
 - project:
     name: openstack/openstack-ansible-os_zaqar
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11532,7 +10417,6 @@
 - project:
     name: openstack/openstack-ansible-os_zun
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11543,7 +10427,6 @@
 - project:
     name: openstack/openstack-ansible-pip_install
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11551,7 +10434,6 @@
 - project:
     name: openstack/openstack-ansible-plugins
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11562,7 +10444,6 @@
 - project:
     name: openstack/openstack-ansible-rabbitmq_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11573,7 +10454,6 @@
 - project:
     name: openstack/openstack-ansible-repo_build
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11581,7 +10461,6 @@
 - project:
     name: openstack/openstack-ansible-repo_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11589,7 +10468,6 @@
 - project:
     name: openstack/openstack-ansible-rsyslog_client
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11597,7 +10475,6 @@
 - project:
     name: openstack/openstack-ansible-rsyslog_server
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11608,14 +10485,12 @@
 - project:
     name: openstack/openstack-ansible-specs
     templates:
-      - system-required
       - openstack-specs-jobs
       - check-requirements
 
 - project:
     name: openstack/openstack-ansible-tests
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -11628,19 +10503,16 @@
 - project:
     name: openstack/openstack-chef-repo
     templates:
-      - system-required
       - build-openstack-sphinx-docs
 
 - project:
     name: openstack/openstack-chef-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/openstack-doc-tools
     templates:
-      - system-required
       - check-requirements
       - release-notes-jobs
       - openstack-python-jobs
@@ -11651,7 +10523,6 @@
 - project:
     name: openstack/openstack-health
     templates:
-      - system-required
       - openstack-python-jobs
       - nodejs4-jobs
       - openstack-python35-jobs
@@ -11659,25 +10530,17 @@
 - project:
     name: openstack/openstack-helm
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - translation-jobs
 
-- project:
-    name: openstack/openstack-helm-addons
-    templates:
-      - system-required
-
 - project:
     name: openstack/openstack-helm-infra
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
 
 - project:
     name: openstack/openstack-manuals
     templates:
-      - system-required
       - translation-jobs
       - release-notes-jobs
     post:
@@ -11689,24 +10552,16 @@
 - project:
     name: openstack/openstack-mentoring-scripts
     templates:
-      - system-required
       - noop-jobs
 
-- project:
-    name: openstack/openstack-planet
-    templates:
-      - system-required
-
 - project:
     name: openstack/openstack-resource-agents
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/openstack-resource-agents-specs
     templates:
-      - system-required
       - build-only-specs-jobs
 
 - project:
@@ -11717,25 +10572,21 @@
 - project:
     name: openstack/openstack-spaceport
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/openstack-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/openstack-ux
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/openstackclient
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -11743,7 +10594,6 @@
 - project:
     name: openstack/openstackdocstheme
     templates:
-      - system-required
       - check-requirements
       - release-notes-jobs
       - publish-openstack-sphinx-docs
@@ -11779,7 +10629,6 @@
 - project:
     name: openstack/openstacksdk
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -11793,19 +10642,16 @@
 - project:
     name: openstack/ops-tags-team
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ops-telecom-nfv
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/os-api-ref
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -11813,7 +10659,6 @@
 - project:
     name: openstack/os-apply-config
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - openstack-python-jobs
@@ -11827,7 +10672,6 @@
     name: openstack/os-brick
     templates:
       - check-requirements
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -11860,7 +10704,6 @@
     name: openstack/os-client-config
     templates:
       - check-requirements
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -11871,7 +10714,6 @@
 - project:
     name: openstack/os-collect-config
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - openstack-python-jobs
@@ -11884,7 +10726,6 @@
 - project:
     name: openstack/os-dpm
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -11893,7 +10734,6 @@
 - project:
     name: openstack/os-faults
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -11902,20 +10742,17 @@
 - project:
     name: openstack/os-log-merger
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/os-namos
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/os-net-config
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - openstack-python-jobs
@@ -11937,7 +10774,6 @@
 - project:
     name: openstack/os-performance-tools
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -11947,7 +10783,6 @@
 - project:
     name: openstack/os-refresh-config
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
       - openstack-python-jobs
@@ -11960,7 +10795,6 @@
 - project:
     name: openstack/os-service-types
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -11971,7 +10805,6 @@
 - project:
     name: openstack/os-testr
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -11981,7 +10814,6 @@
 - project:
     name: openstack/os-traits
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - check-requirements
@@ -11992,7 +10824,6 @@
 - project:
     name: openstack/os-vif
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - check-requirements
@@ -12010,7 +10841,6 @@
 - project:
     name: openstack/os-win
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12022,7 +10852,6 @@
 - project:
     name: openstack/os-xenapi
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12032,7 +10861,6 @@
     name: openstack/osc-lib
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-pypy-jobs-nonvoting
@@ -12044,7 +10872,6 @@
 - project:
     name: openstack/osc-placement
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12055,19 +10882,16 @@
 - project:
     name: openstack/osel
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/oslo-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/oslo.cache
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs-python3
       - check-requirements
@@ -12081,7 +10905,6 @@
 - project:
     name: openstack/oslo.concurrency
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs-python3
       - check-requirements
@@ -12098,7 +10921,6 @@
 - project:
     name: openstack/oslo.config
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12111,7 +10933,6 @@
 - project:
     name: openstack/oslo.context
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12124,7 +10945,6 @@
 - project:
     name: openstack/oslo.db
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12138,7 +10958,6 @@
 - project:
     name: openstack/oslo.i18n
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12155,13 +10974,11 @@
 - project:
     name: openstack/oslo.limit
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/oslo.log
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12175,7 +10992,6 @@
 - project:
     name: openstack/oslo.messaging
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12192,7 +11008,6 @@
 - project:
     name: openstack/oslo.middleware
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12206,7 +11021,6 @@
 - project:
     name: openstack/oslo.policy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12220,7 +11034,6 @@
 - project:
     name: openstack/oslo.privsep
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12234,7 +11047,6 @@
 - project:
     name: openstack/oslo.reports
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12248,7 +11060,6 @@
 - project:
     name: openstack/oslo.rootwrap
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-python3
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -12261,7 +11072,6 @@
 - project:
     name: openstack/oslo.serialization
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12274,7 +11084,6 @@
 - project:
     name: openstack/oslo.service
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12288,13 +11097,11 @@
 - project:
     name: openstack/oslo.tools
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/oslo.utils
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12308,7 +11115,6 @@
 - project:
     name: openstack/oslo.versionedobjects
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12322,7 +11128,6 @@
 - project:
     name: openstack/oslo.vmware
     templates:
-      - system-required
       - openstack-python35-jobs
       - openstack-python-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12335,7 +11140,6 @@
 - project:
     name: openstack/oslosphinx
     templates:
-      - system-required
       - publish-openstack-sphinx-docs-python3
       - check-requirements
       - release-notes-jobs-python3
@@ -12354,7 +11158,6 @@
 - project:
     name: openstack/oslotest
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -12369,25 +11172,20 @@
 - project:
     name: openstack/osops-coda
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/osops-example-configs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/osops-tools-contrib
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/osops-tools-generic
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-bashate
@@ -12398,19 +11196,16 @@
 - project:
     name: openstack/osops-tools-logging
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/osops-tools-monitoring
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/osprofiler
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12429,7 +11224,6 @@
 - project:
     name: openstack/ospurge
     templates:
-      - system-required
       - openstack-python35-jobs
       - build-openstack-sphinx-docs
     check:
@@ -12446,7 +11240,6 @@
 - project:
     name: openstack/ossa
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -12455,7 +11248,6 @@
 - project:
     name: openstack/oswin-tempest-plugin
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12466,7 +11258,6 @@
 - project:
     name: openstack/ovsdbapp
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12486,7 +11277,6 @@
 - project:
     name: openstack/packetary
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -12496,7 +11286,6 @@
     name: openstack/packetary-specs
     templates:
       - docs-on-readthedocs
-      - system-required
       - build-only-specs-jobs
     check:
       jobs:
@@ -12507,8 +11296,6 @@
 
 - project:
     name: openstack/packstack
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -12529,13 +11316,11 @@
 - project:
     name: openstack/pandaman
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/panko
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -12546,7 +11331,6 @@
 - project:
     name: openstack/patrole
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12557,25 +11341,19 @@
       jobs:
         - openstack-tox-cover:
             voting: false
+
 - project:
     name: openstack/paunch
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - release-notes-jobs
       - publish-to-pypi
 
-- project:
-    name: openstack/pbrx
-    templates:
-      - system-required
-
 - project:
     name: openstack/performa
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
       - publish-to-pypi
@@ -12583,20 +11361,17 @@
 - project:
     name: openstack/performance-docs
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
 
 - project:
     name: openstack/picasso
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/poppy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -12606,7 +11381,6 @@
 - project:
     name: openstack/poppy-ui
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -12617,13 +11391,10 @@
 - project:
     name: openstack/powervc-driver
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/project-navigator-data
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -12636,7 +11407,6 @@
 - project:
     name: openstack/project-team-guide
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -12645,7 +11415,6 @@
 - project:
     name: openstack/proliantutils
     templates:
-      - system-required
       - openstack-python35-jobs
       - publish-to-pypi
     check:
@@ -12661,8 +11430,6 @@
 
 - project:
     name: openstack/ptgbot
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -12673,7 +11440,6 @@
 - project:
     name: openstack/publiccloud-wg
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -12685,69 +11451,59 @@
 - project:
     name: openstack/puppet-aodh
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-autossh
     templates:
-      - system-required
       - puppet-openstack-check-jobs
 
 - project:
     name: openstack/puppet-barbican
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-ceilometer
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-ceph
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-cinder
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-cloudkitty
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-congress
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-designate
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-ec2api
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
@@ -12760,77 +11516,66 @@
 - project:
     name: openstack/puppet-freezer
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-glance
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-glare
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-gnocchi
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-heat
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-horizon
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-ironic
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-keystone
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-magnum
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-manila
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-midonet
     templates:
-      - system-required
       - puppet-beaker-jobs
     check:
       jobs:
@@ -12905,78 +11650,57 @@
 - project:
     name: openstack/puppet-mistral
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
-- project:
-    name: openstack/puppet-modulesync-configs
-    templates:
-      - system-required
-
 - project:
     name: openstack/puppet-monasca
     templates:
-      - system-required
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-murano
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-n1k-vsm
     templates:
-      - system-required
       - puppet-openstack-check-jobs
       - puppet-module-unit-jobs
 
 - project:
     name: openstack/puppet-neutron
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-nova
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-octavia
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
-- project:
-    name: openstack/puppet-openstack-cookiecutter
-    templates:
-      - system-required
-
 - project:
     name: openstack/puppet-openstack_extras
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-openstack-guide
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
 
 - project:
     name: openstack/puppet-openstack-integration
-    templates:
-      - system-required
     periodic:
       jobs:
         - propose-updates:
@@ -12987,13 +11711,11 @@
 - project:
     name: openstack/puppet-openstack_spec_helper
     templates:
-      - system-required
       - release-notes-jobs
 
 - project:
     name: openstack/puppet-openstack-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -13005,103 +11727,88 @@
 - project:
     name: openstack/puppet-openstacklib
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-oslo
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-ovn
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-pacemaker
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-panko
     templates:
-      - system-required
       - puppet-release-jobs
       - release-notes-jobs
 
 - project:
     name: openstack/puppet-qdr
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-rally
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-sahara
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-senlin
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-setproxy
     templates:
-      - system-required
       - puppet-openstack-check-jobs
 
 - project:
     name: openstack/puppet-surveil
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/puppet-swift
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-tacker
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-tempest
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-tripleo
     templates:
-      - system-required
       - puppet-openstack-check-jobs
       - puppet-release-jobs
       - release-notes-jobs
@@ -13109,48 +11816,41 @@
 - project:
     name: openstack/puppet-trove
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-tuskar
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/puppet-vitrage
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-vswitch
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-watcher
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/puppet-zaqar
     templates:
-      - system-required
       - release-notes-jobs
       - puppet-release-jobs
 
 - project:
     name: openstack/pycadf
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13164,7 +11864,6 @@
 - project:
     name: openstack/pyeclib
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
     experimental:
@@ -13174,7 +11873,6 @@
 - project:
     name: openstack/pyghmi
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -13183,7 +11881,6 @@
 - project:
     name: openstack/pymod2pkg
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13193,14 +11890,12 @@
 - project:
     name: openstack/python-adjutantclient
     templates:
-      - system-required
       - noop-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/python-almanachclient
     templates:
-      - system-required
       - openstack-python35-jobs
       - check-requirements
       - docs-on-readthedocs
@@ -13216,7 +11911,6 @@
 - project:
     name: openstack/python-aodhclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13226,14 +11920,12 @@
 - project:
     name: openstack/python-apmecclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
 
 - project:
     name: openstack/python-barbicanclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13256,7 +11948,6 @@
 - project:
     name: openstack/python-bileanclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13265,7 +11956,6 @@
 - project:
     name: openstack/python-blazarclient
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -13274,7 +11964,6 @@
 - project:
     name: openstack/python-brick-cinderclient-ext
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13285,7 +11974,6 @@
 - project:
     name: openstack/python-cinderclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13304,7 +11992,6 @@
 - project:
     name: openstack/python-cloudkittyclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstackclient-plugin-jobs
@@ -13316,21 +12003,18 @@
 - project:
     name: openstack/python-cloudpulseclient
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/python-cognitiveclient
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/python-congressclient
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstackclient-plugin-jobs
@@ -13341,7 +12025,6 @@
 - project:
     name: openstack/python-cyborgclient
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstackclient-plugin-jobs
@@ -13352,7 +12035,6 @@
 - project:
     name: openstack/python-designateclient
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - check-requirements
@@ -13366,7 +12048,6 @@
 - project:
     name: openstack/python-distilclient
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
@@ -13374,14 +12055,12 @@
 - project:
     name: openstack/python-don
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/python-dracclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -13395,7 +12074,6 @@
 - project:
     name: openstack/python-freezerclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13413,7 +12091,6 @@
     name: openstack/python-fuelclient
     templates:
       - openstack-python35-jobs
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -13427,13 +12104,11 @@
 - project:
     name: openstack/python-ganttclient
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/python-glanceclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - release-notes-jobs
@@ -13448,7 +12123,6 @@
 - project:
     name: openstack/python-glareclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13457,7 +12131,6 @@
 - project:
     name: openstack/python-group-based-policy-client
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python-jobs-trusty
       - publish-to-pypi
@@ -13465,7 +12138,6 @@
 - project:
     name: openstack/python-heatclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13481,7 +12153,6 @@
 - project:
     name: openstack/python-hnvclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13490,7 +12161,6 @@
 - project:
     name: openstack/python-iotronicclient
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
@@ -13498,7 +12168,6 @@
 - project:
     name: openstack/python-ironic-inspector-client
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13510,7 +12179,6 @@
 - project:
     name: openstack/python-ironicclient
     templates:
-      - system-required
       - openstack-python35-jobs
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
@@ -13528,7 +12196,6 @@
 - project:
     name: openstack/python-jenkins
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -13544,13 +12211,11 @@
 - project:
     name: openstack/python-k8sclient
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/python-karborclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13566,7 +12231,6 @@
 - project:
     name: openstack/python-keystoneclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13587,7 +12251,6 @@
     name: openstack/python-kingbirdclient
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -13595,7 +12258,6 @@
 - project:
     name: openstack/python-magnumclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13610,7 +12272,6 @@
 - project:
     name: openstack/python-manilaclient
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -13624,7 +12285,6 @@
 - project:
     name: openstack/python-masakariclient
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
@@ -13633,13 +12293,11 @@
 - project:
     name: openstack/python-meteosclient
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/python-mistralclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13651,7 +12309,6 @@
 - project:
     name: openstack/python-moganclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13660,7 +12317,6 @@
 - project:
     name: openstack/python-monascaclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13684,7 +12340,6 @@
 - project:
     name: openstack/python-muranoclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13708,13 +12363,11 @@
 - project:
     name: openstack/python-namosclient
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/python-neutronclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13765,7 +12418,6 @@
 - project:
     name: openstack/python-novaclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13781,7 +12433,6 @@
 - project:
     name: openstack/python-octaviaclient
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - check-requirements
@@ -13797,7 +12448,6 @@
     name: openstack/python-oneviewclient
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -13805,7 +12455,6 @@
 - project:
     name: openstack/python-openstackclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13821,7 +12470,6 @@
 - project:
     name: openstack/python-opentsdbclient
     templates:
-      - system-required
       - openstack-python35-jobs
     check:
       jobs:
@@ -13835,7 +12483,6 @@
 - project:
     name: openstack/python-pankoclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13845,13 +12492,11 @@
 - project:
     name: openstack/python-picassoclient
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/python-qinlingclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13869,7 +12514,6 @@
 - project:
     name: openstack/python-redfish
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13878,7 +12522,6 @@
 - project:
     name: openstack/python-rsdclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstackclient-plugin-jobs
@@ -13887,7 +12530,6 @@
 - project:
     name: openstack/python-saharaclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13907,7 +12549,6 @@
 - project:
     name: openstack/python-scciclient
     templates:
-      - system-required
       - check-requirements
       - openstack-python35-jobs
       - openstack-python-jobs
@@ -13916,7 +12557,6 @@
 - project:
     name: openstack/python-searchlightclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13928,7 +12568,6 @@
     name: openstack/python-senlinclient
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13940,7 +12579,6 @@
 - project:
     name: openstack/python-solumclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -13955,7 +12593,6 @@
 - project:
     name: openstack/python-surveilclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -13963,7 +12600,6 @@
 - project:
     name: openstack/python-swiftclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -13994,7 +12630,6 @@
 - project:
     name: openstack/python-tackerclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -14005,13 +12640,11 @@
 - project:
     name: openstack/python-tatuclient
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/python-tempestconf
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -14020,7 +12653,6 @@
 - project:
     name: openstack/python-tricircleclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14034,7 +12666,6 @@
 - project:
     name: openstack/python-tripleoclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14046,7 +12677,6 @@
 - project:
     name: openstack/python-troveclient
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -14065,7 +12695,6 @@
 - project:
     name: openstack/python-valenceclient
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -14073,7 +12702,6 @@
 - project:
     name: openstack/python-vitrageclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -14085,7 +12713,6 @@
 - project:
     name: openstack/python-watcherclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -14100,7 +12727,6 @@
 - project:
     name: openstack/python-zaqarclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14118,7 +12744,6 @@
 - project:
     name: openstack/python-zunclient
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14128,13 +12753,11 @@
 - project:
     name: openstack/qa-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/qinling
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14151,7 +12774,6 @@
 - project:
     name: openstack/quark
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -14166,13 +12788,11 @@
 - project:
     name: openstack/radar
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/rally
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -14182,13 +12802,10 @@
 - project:
     name: openstack/rally-openstack
     templates:
-      - system-required
       - publish-to-pypi
 
 - project:
     name: openstack/ramdisk-func-test
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14199,19 +12816,16 @@
 - project:
     name: openstack/ranger
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/ranger-agent
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/refstack
     templates:
-      - system-required
       - nodejs4-jobs
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -14233,7 +12847,6 @@
 - project:
     name: openstack/refstack-client
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
     post:
@@ -14243,18 +12856,11 @@
 - project:
     name: openstack/release-schedule-generator
     templates:
-      - system-required
       - noop-jobs
 
-- project:
-    name: openstack/release-test
-    templates:
-      - system-required
-
 - project:
     name: openstack/releases
     templates:
-      - system-required
       - openstack-python35-jobs
     check:
       jobs:
@@ -14273,22 +12879,15 @@
 - project:
     name: openstack/renderspec
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
       - check-requirements
       - publish-to-pypi
 
-- project:
-    name: openstack/reno
-    templates:
-      - system-required
-
 - project:
     name: openstack/requirements
     templates:
-      - system-required
       - openstack-pypy-jobs-nonvoting
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -14370,15 +12969,8 @@
               - ^(test-|)requirements.txt$
               - ^setup.cfg$
 
-- project:
-    name: openstack/rpm-packaging
-    templates:
-      - system-required
-
 - project:
     name: openstack/rpm-packaging-tools
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14389,7 +12981,6 @@
 - project:
     name: openstack/rsd-lib
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -14397,7 +12988,6 @@
 - project:
     name: openstack/rst2bash
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
     check:
@@ -14410,7 +13000,6 @@
 - project:
     name: openstack/sahara
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - periodic-stable-jobs
@@ -14440,8 +13029,6 @@
 
 - project:
     name: openstack/sahara-ci-config
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14452,7 +13039,6 @@
 - project:
     name: openstack/sahara-dashboard
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
@@ -14469,7 +13055,6 @@
 - project:
     name: openstack/sahara-extra
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -14488,7 +13073,6 @@
 - project:
     name: openstack/sahara-image-elements
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -14504,7 +13088,6 @@
 - project:
     name: openstack/sahara-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -14516,7 +13099,6 @@
 - project:
     name: openstack/sahara-tests
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - openstack-python35-jobs
@@ -14537,7 +13119,6 @@
 - project:
     name: openstack/scalpels
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -14548,8 +13129,6 @@
 
 - project:
     name: openstack/scientific-wg
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-py27
@@ -14560,7 +13139,6 @@
 - project:
     name: openstack/searchlight
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -14574,7 +13152,6 @@
 - project:
     name: openstack/searchlight-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -14587,7 +13164,6 @@
     name: openstack/searchlight-ui
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
       - release-notes-jobs
@@ -14600,19 +13176,16 @@
 - project:
     name: openstack/security-analysis
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
 
 - project:
     name: openstack/security-doc
     templates:
-      - system-required
       - translation-jobs
 
 - project:
     name: openstack/security-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -14621,16 +13194,10 @@
       jobs:
         - openstack-tox-py27
 
-- project:
-    name: openstack/self-healing-sig
-    templates:
-      - system-required
-
 - project:
     name: openstack/senlin
     templates:
       - check-requirements
-      - system-required
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -14650,7 +13217,6 @@
     name: openstack/senlin-dashboard
     templates:
       - check-requirements
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - nodejs4-jobs
@@ -14662,7 +13228,6 @@
 - project:
     name: openstack/senlin-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -14671,7 +13236,6 @@
 - project:
     name: openstack/service-types-authority
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -14691,15 +13255,12 @@
 - project:
     name: openstack/shaker
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/shotgun
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14712,20 +13273,17 @@
 - project:
     name: openstack/shovel
     templates:
-      - system-required
       - nodejs4-jobs
       - nodejs4-publish-to-npm
 
 - project:
     name: openstack/shovel-horizon
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/slogging
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - publish-to-pypi
@@ -14733,92 +13291,77 @@
 - project:
     name: openstack/snap-ceilometer
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-cinder
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-glance
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-gnocchi
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-keystone
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-neutron
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-nova
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-nova-hypervisor
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-openstackclients
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-rally
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap-tempest
     templates:
-      - system-required
       - snap-jobs
 
 - project:
     name: openstack/snap.openstack
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/solar
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
 
 - project:
     name: openstack/solar-resources
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/solum
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -14836,7 +13379,6 @@
 - project:
     name: openstack/solum-dashboard
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - check-requirements
@@ -14847,7 +13389,6 @@
 - project:
     name: openstack/solum-infra-guestagent
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -14859,13 +13400,11 @@
 - project:
     name: openstack/solum-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/solum-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -14874,13 +13413,11 @@
 - project:
     name: openstack/spanner
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/sphinx-feature-classification
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - openstack-python-jobs
@@ -14890,7 +13427,6 @@
 - project:
     name: openstack/sqlalchemy-migrate
     templates:
-      - system-required
       - docs-on-readthedocs
       - openstack-python35-jobs-nonvoting
       - publish-to-pypi
@@ -14911,7 +13447,6 @@
 - project:
     name: openstack/stackalytics
     templates:
-      - system-required
       - publish-to-pypi-quietly
       - docs-on-readthedocs
       - openstack-python-jobs
@@ -14919,8 +13454,6 @@
 
 - project:
     name: openstack/stacklight-integration-tests
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14930,8 +13463,6 @@
 
 - project:
     name: openstack/stacktach
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14943,8 +13474,6 @@
 
 - project:
     name: openstack/stacktach-klugman
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14956,8 +13485,6 @@
 
 - project:
     name: openstack/stacktach-notification-utils
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14970,13 +13497,10 @@
 - project:
     name: openstack/stacktach-notigen
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stacktach-quince
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -14988,8 +13512,6 @@
 
 - project:
     name: openstack/stacktach-quincy
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15002,13 +13524,10 @@
 - project:
     name: openstack/stacktach-sandbox
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stacktach-shoebox
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15020,8 +13539,6 @@
 
 - project:
     name: openstack/stacktach-simport
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15033,8 +13550,6 @@
 
 - project:
     name: openstack/stacktach-stackdistiller
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15046,8 +13561,6 @@
 
 - project:
     name: openstack/stacktach-timex
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15059,8 +13572,6 @@
 
 - project:
     name: openstack/stacktach-winchester
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15073,13 +13584,11 @@
 - project:
     name: openstack/stackube
     templates:
-      - system-required
       - golang-jobs
 
 - project:
     name: openstack/stackviz
     templates:
-      - system-required
       - nodejs4-jobs
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
@@ -15091,14 +13600,12 @@
 - project:
     name: openstack/steth
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/stevedore
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -15111,7 +13618,6 @@
 - project:
     name: openstack/storlets
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -15121,109 +13627,91 @@
 - project:
     name: openstack/stx-clients
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-config
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-fault
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-gplv2
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-gplv3
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-gui
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-ha
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-integ
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-manifest
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-metal
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-nfv
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-root
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-tis-repo
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-tools
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-update
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-upstream
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/stx-utils
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/surveil
     templates:
-      - system-required
       - docs-on-readthedocs
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -15233,13 +13721,11 @@
 - project:
     name: openstack/surveil-specs
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/sushy
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -15256,7 +13742,6 @@
 - project:
     name: openstack/sushy-tools
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -15265,7 +13750,6 @@
 - project:
     name: openstack/swauth
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
       - check-requirements
@@ -15274,7 +13758,6 @@
 - project:
     name: openstack/swift
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - release-openstack-server
       - periodic-stable-jobs
@@ -15378,14 +13861,11 @@
 - project:
     name: openstack/swift-bench
     templates:
-      - system-required
       - publish-to-pypi
       - openstack-python-jobs
 
 - project:
     name: openstack/swift-ceph-backend
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15398,13 +13878,11 @@
 - project:
     name: openstack/swift-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/swift3
     templates:
-      - system-required
       - openstack-python-jobs
     check:
       jobs:
@@ -15421,8 +13899,6 @@
 
 - project:
     name: openstack/swiftonfile
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-pep8
@@ -15435,7 +13911,6 @@
 - project:
     name: openstack/swiftonhpss
     templates:
-      - system-required
       - publish-to-pypi
     check:
       jobs:
@@ -15449,21 +13924,18 @@
 - project:
     name: openstack/synergy-scheduler-manager
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/synergy-service
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/syntribos
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -15473,19 +13945,16 @@
 - project:
     name: openstack/syntribos-openstack-templates
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/syntribos-payloads
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tacker
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - publish-openstack-sphinx-docs
@@ -15499,7 +13968,6 @@
 - project:
     name: openstack/tacker-horizon
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -15509,7 +13977,6 @@
 - project:
     name: openstack/tacker-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -15521,7 +13988,6 @@
 - project:
     name: openstack/tap-as-a-service
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
@@ -15535,7 +14001,6 @@
 - project:
     name: openstack/tap-as-a-service-dashboard
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
@@ -15543,7 +14008,6 @@
 - project:
     name: openstack/taskflow
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -15559,25 +14023,21 @@
 - project:
     name: openstack/tatu
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tatu-dashboard
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tc-as-a-service
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/telcowg-usecases
     templates:
-      - system-required
       - build-only-specs-jobs
     check:
       jobs:
@@ -15589,7 +14049,6 @@
 - project:
     name: openstack/telemetry-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -15601,7 +14060,6 @@
 - project:
     name: openstack/telemetry-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -15610,7 +14068,6 @@
 - project:
     name: openstack/tempest
     templates:
-      - system-required
       - check-requirements
       - integrated-gate
       - integrated-gate-py35
@@ -15996,7 +14453,6 @@
 - project:
     name: openstack/tempest-horizon
     templates:
-      - system-required
       - check-requirements
       - publish-to-pypi
     check:
@@ -16010,52 +14466,44 @@
 - project:
     name: openstack/tempest-lib
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tempest-plugin-cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tempest-stress
     templates:
-      - system-required
       - openstack-python-jobs
 
 - project:
     name: openstack/tempest-tripleo-ui
     templates:
-      - system-required
       - check-requirements
       - release-notes-jobs
 
 - project:
     name: openstack/terracotta
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/third-party-ci-tools
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/timmy
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/tooz
     templates:
-      - system-required
       - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -16071,7 +14519,6 @@
 - project:
     name: openstack/tosca-parser
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -16084,13 +14531,11 @@
 - project:
     name: openstack/training-guides
     templates:
-      - system-required
       - translation-jobs
 
 - project:
     name: openstack/training-labs
     templates:
-      - system-required
       - openstack-python-jobs
     post:
       jobs:
@@ -16099,7 +14544,6 @@
 - project:
     name: openstack/transparency-policy
     templates:
-      - system-required
       - build-openstack-sphinx-docs
     post:
       jobs:
@@ -16108,7 +14552,6 @@
 - project:
     name: openstack/tricircle
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16129,7 +14572,6 @@
 - project:
     name: openstack/trio2o
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - publish-to-pypi
@@ -16141,7 +14583,6 @@
 - project:
     name: openstack/tripleo-common
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - publish-to-pypi
@@ -16156,7 +14597,6 @@
 - project:
     name: openstack/tripleo-common-tempest-plugin
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16166,7 +14606,6 @@
 - project:
     name: openstack/tripleo-docs
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
     check:
       jobs:
@@ -16178,13 +14617,11 @@
 - project:
     name: openstack/tripleo-ha-utils
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/tripleo-heat-templates
     templates:
-      - system-required
       - publish-to-pypi
       - check-requirements
       - release-notes-jobs
@@ -16200,7 +14637,6 @@
 - project:
     name: openstack/tripleo-image-elements
     templates:
-      - system-required
       - publish-to-pypi
       - release-notes-jobs
     post:
@@ -16210,14 +14646,12 @@
 - project:
     name: openstack/tripleo-ipsec
     templates:
-      - system-required
       - ansible-lint-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/tripleo-puppet-elements
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
       - release-notes-jobs
@@ -16225,7 +14659,6 @@
 - project:
     name: openstack/tripleo-quickstart
     templates:
-      - system-required
       - publish-openstack-sphinx-docs
       - release-openstack-server
       - release-notes-jobs
@@ -16240,7 +14673,6 @@
 - project:
     name: openstack/tripleo-quickstart-extras
     templates:
-      - system-required
       - release-openstack-server
       - release-notes-jobs
     check:
@@ -16254,7 +14686,6 @@
 - project:
     name: openstack/tripleo-repos
     templates:
-      - system-required
       - publish-to-pypi
       - openstack-python-jobs
       - openstack-python35-jobs
@@ -16267,7 +14698,6 @@
 - project:
     name: openstack/tripleo-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -16279,7 +14709,6 @@
 - project:
     name: openstack/tripleo-ui
     templates:
-      - system-required
       - nodejs8-jobs
       - nodejs8-publish-to-npm
       - release-notes-jobs
@@ -16290,7 +14719,6 @@
 - project:
     name: openstack/tripleo-upgrade
     templates:
-      - system-required
       - check-requirements
       - release-notes-jobs
       - publish-to-pypi
@@ -16308,7 +14736,6 @@
 - project:
     name: openstack/tripleo-validations
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16319,7 +14746,6 @@
 - project:
     name: openstack/trove
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -16344,7 +14770,6 @@
 - project:
     name: openstack/trove-dashboard
     templates:
-      - system-required
       - check-requirements
       - translation-jobs
       - translation-jobs-pike
@@ -16368,7 +14793,6 @@
 - project:
     name: openstack/trove-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -16380,7 +14804,6 @@
 - project:
     name: openstack/trove-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -16389,45 +14812,38 @@
 - project:
     name: openstack/tuning-box
     templates:
-      - system-required
       - openstack-python-jobs
       - publish-to-pypi
 
 - project:
     name: openstack/turbo-hipster
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
 
 - project:
     name: openstack/uc-recognition
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/ui-cookiecutter
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/upstream-institute-virtual-environment
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/vahana
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/valence
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -16442,13 +14858,11 @@
 - project:
     name: openstack/valence-specs
     templates:
-      - system-required
       - build-only-specs-jobs
 
 - project:
     name: openstack/valet
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
@@ -16457,7 +14871,6 @@
 - project:
     name: openstack/virtualbmc
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16466,7 +14879,6 @@
 - project:
     name: openstack/virtualpdu
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -16482,7 +14894,6 @@
 - project:
     name: openstack/vitrage
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16495,7 +14906,6 @@
 - project:
     name: openstack/vitrage-dashboard
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -16506,13 +14916,11 @@
 - project:
     name: openstack/vitrage-specs
     templates:
-      - system-required
       - openstack-specs-jobs
 
 - project:
     name: openstack/vitrage-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
       - publish-openstack-sphinx-docs
@@ -16522,8 +14930,6 @@
 
 - project:
     name: openstack/vm-bm-wg
-    templates:
-      - system-required
     check:
       jobs:
         - openstack-tox-py27
@@ -16534,7 +14940,6 @@
 - project:
     name: openstack/vmtp
     templates:
-      - system-required
       - openstack-python-jobs
       - docs-on-readthedocs
       - publish-to-pypi
@@ -16542,7 +14947,6 @@
 - project:
     name: openstack/vmware-nsx
     templates:
-      - system-required
       - openstack-python-jobs-neutron
       - check-requirements
       - openstack-python35-jobs-neutron
@@ -16765,7 +15169,6 @@
 - project:
     name: openstack/vmware-nsx-tempest-plugin
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
@@ -16775,7 +15178,6 @@
 - project:
     name: openstack/vmware-nsxlib
     templates:
-      - system-required
       - openstack-python-jobs
       - check-requirements
       - openstack-python35-jobs
@@ -16784,7 +15186,6 @@
 - project:
     name: openstack/vmware-vspc
     templates:
-      - system-required
       - openstack-python35-jobs
       - publish-to-pypi
     check:
@@ -16797,7 +15198,6 @@
 - project:
     name: openstack/watcher
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -16812,7 +15212,6 @@
 - project:
     name: openstack/watcher-dashboard
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - publish-openstack-sphinx-docs
@@ -16825,7 +15224,6 @@
 - project:
     name: openstack/watcher-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -16837,7 +15235,6 @@
 - project:
     name: openstack/watcher-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -16846,7 +15243,6 @@
 - project:
     name: openstack/whereto
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs-python3
@@ -16855,19 +15251,16 @@
 - project:
     name: openstack/windmill
     templates:
-      - system-required
       - docs-on-readthedocs
 
 - project:
     name: openstack/workload-ref-archs
     templates:
-      - system-required
       - build-openstack-sphinx-docs
 
 - project:
     name: openstack/wsme
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -16875,265 +15268,227 @@
 - project:
     name: openstack/xenapi-os-testing
     templates:
-      - system-required
       - noop-jobs
 
 - project:
     name: openstack/xstatic-angular
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-bootstrap
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-cookies
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-fileupload
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-gettext
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-lrdragndrop
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-material
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-mock
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-notify
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-sanitize
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-smart-table
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-ui-router
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-uuid
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-angular-vis
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-bootstrap-datepicker
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-bootstrap-scss
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-bootswatch
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-d3
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-filesaver
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-font-awesome
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-hogan
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jasmine
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jquery-migrate
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jquery.bootstrap.wizard
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jquery.quicksearch
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jquery.tablesorter
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-js-yaml
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-jsencrypt
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-json2yaml
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-magic-search
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-mdi
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-qunit
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-rickshaw
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-roboto-fontface
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-spin
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/xstatic-vis
     templates:
-      - system-required
       - noop-jobs
       - publish-xstatic-to-pypi
 
 - project:
     name: openstack/yaql
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - docs-on-readthedocs
@@ -17142,7 +15497,6 @@
 - project:
     name: openstack/zaqar
     templates:
-      - system-required
       - openstack-python35-jobs
       - openstack-python-jobs
       - periodic-stable-jobs
@@ -17164,7 +15518,6 @@
 - project:
     name: openstack/zaqar-specs
     templates:
-      - system-required
       - openstack-specs-jobs
     check:
       jobs:
@@ -17176,7 +15529,6 @@
 - project:
     name: openstack/zaqar-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - tempest-plugin-jobs
     gate:
@@ -17185,7 +15537,6 @@
 - project:
     name: openstack/zaqar-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - nodejs4-jobs
@@ -17200,7 +15551,6 @@
 - project:
     name: openstack/zun
     templates:
-      - system-required
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-openstack-sphinx-docs
@@ -17213,7 +15563,6 @@
 - project:
     name: openstack/zun-tempest-plugin
     templates:
-      - system-required
       - check-requirements
       - publish-openstack-sphinx-docs
       - tempest-plugin-jobs
@@ -17224,7 +15573,6 @@
 - project:
     name: openstack/zun-ui
     templates:
-      - system-required
       - openstack-python-jobs-horizon
       - openstack-python35-jobs-horizon
       - check-requirements
@@ -17250,9 +15598,6 @@
 
 - project:
     name: sigmavirus24/github3.py
-    # sigmavirus24/github3.py does not include system-required on purpose. We
-    # do not gate sigmavirus24/github3.py and we should not be doing
-    # merge-check on it.
     third-party-check:
       jobs:
         - tox-py35-on-zuul