From 9404b5a6ea6794aa0040dd37d67de7b9c37fb008 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 13 Oct 2017 09:22:33 +0200 Subject: [PATCH] Use system-required instead of merge-check Change-Id: I09a0f9ecb3bba693caac67958675cce7fd554a5e Depends-On: I45213b92a7af6b8b7fd35feb60dbd346b2f7bc5f --- doc/source/creators.rst | 12 ++++++------ doc/source/zuulv3.rst | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/creators.rst b/doc/source/creators.rst index 89ac0ee..c3503f2 100644 --- a/doc/source/creators.rst +++ b/doc/source/creators.rst @@ -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/ 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/ templates: - - merge-check + - system-required - translation-jobs diff --git a/doc/source/zuulv3.rst b/doc/source/zuulv3.rst index f49ec18..fa25992 100644 --- a/doc/source/zuulv3.rst +++ b/doc/source/zuulv3.rst @@ -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)