From 6e473d6d47e789f3b0edf6ff54c3fcd45f66714a Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 3 Oct 2013 09:08:44 +1300 Subject: [PATCH] Better recommendations for adding sections. Adding at the end of files is a guaranteed merge conflict. Change-Id: I6dceb8fb0ad95c54940c55a023eb9eb088b5ea16 --- doc/source/stackforge.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst index 874d096acf..e6e50104b0 100644 --- a/doc/source/stackforge.rst +++ b/doc/source/stackforge.rst @@ -52,8 +52,8 @@ sure you have cloned the openstack-infra/config repository First you need to add your StackForge project to the master project list. Edit ``modules/openstack_project/templates/review.projects.yaml.erb`` -and add a new section for your project at the end of the file. It should -look something like:: +and add a new section for your project in alphabetical order within the file. +It should look something like:: - project: stackforge/project-name description: Latest and greatest cloud stuff. @@ -107,7 +107,7 @@ and Zuul for the new StackForge project. If you are interested in using the standard python Jenkins jobs (docs, pep8, python 2.6 and 2.7 unittests, and coverage), edit ``modules/openstack_project/files/jenkins_job_builder/config/projects.yaml`` -and add a new section for your project at the end of the file. It +and add a new section for your project in alphabetical order in the file. It should look something like:: - project: @@ -146,8 +146,8 @@ jobs yet, you don't need to edit ``projects.yaml``. Now that we have Jenkins jobs we need to tell Zuul to run them when appropriate. Edit ``modules/openstack_project/files/zuul/layout.yaml`` -and add a new section for your project at the end of the file. It -should look something like:: +and add a new section for your project in alphabetical order within the file. +It should look something like:: - name: stackforge/project-name check: