Use system-required instead of merge-check

Change-Id: I09a0f9ecb3bba693caac67958675cce7fd554a5e
Depends-On: I45213b92a7af6b8b7fd35feb60dbd346b2f7bc5f
This commit is contained in:
Andreas Jaeger 2017-10-13 09:22:33 +02:00
parent a3bf876494
commit 9404b5a6ea
2 changed files with 8 additions and 8 deletions

View File

@ -516,11 +516,11 @@ Every project needs at least one test job or patches will not be able to land.
There are a multitude of options at your disposal for jobs, but to get started
you should do the following:
Add merge-check template
------------------------
Add system-required template
----------------------------
Every project needs to have an entry in ``zuul.d/projects.yaml``
containing an entry for the ``merge-check`` template.
containing an entry for the ``system-required`` template.
Edit ``zuul.d/projects.yaml`` and add an entry for your project in alphabetical
order:
@ -530,7 +530,7 @@ order:
- project:
name: openstack/<projectname>
templates:
- merge-check
- system-required
Adding additional jobs can be done in the central repository of in
your new project's ``.zuul.yaml`` file. For more information on
@ -539,7 +539,7 @@ addition additional jobs into your project, see
.. important::
This addition of ``merge-check`` template needs to be a separate
This addition of ``system-required`` template needs to be a separate
change stacked on top of the project creation one. Submit them
together. This second change will fail initially, it can only pass
once the first change merged - and then you need to add a
@ -1166,7 +1166,7 @@ including the following changes:
- project:
name: openstack/<projectname>
templates:
- merge-check
- system-required
- translation-jobs

View File

@ -786,7 +786,7 @@ What Not to Convert?
~~~~~~~~~~~~~~~~~~~~
Note that some jobs should always stay in `project-config`_. We always
like to have ``merge-check`` in `project-config`_, since that's a system
mast have ``system-required`` in `project-config`_, since that's a system
thing.
Official OpenStack projects should implement the OpenStack wide jobs
@ -800,7 +800,7 @@ access the external translation site.
So, a non-complete list of templates that should not live in project's own
configuration but stay in `project-config`_:
* merge-check (system template)
* system-required (system template)
* announce-release
* check-requirements (PTI)
* openstack-python-jobs (PTI)