From 98b792d58f364c704c4166d37456a55777fbec92 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Tue, 24 May 2022 10:35:57 +0200 Subject: [PATCH] Clarifying project branching model in CONTRIBUTING.rst The CONTRIBUTING.rst is now included among the files triggering execution of the tox-docs job. This patches a dimunitive but nonetheless extant hole in our doc CI coverage. Signed-off-by: Jiri Podivin Change-Id: I5cf39ea9c537c9f2f8537df1bb117c258379a326 --- .zuul.yaml | 1 + CONTRIBUTING.rst | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 2fbcaccc..8fcd0c12 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -62,6 +62,7 @@ - ^doc/.* - ^README.rst - ^validations_libs/.* + - ^CONTRIBUTING.rst - validations-libs-functional - tripleo-ci-centos-9-undercloud-containers: &undercloud_containers_job_params dependencies: diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index d4d704bd..9267151d 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -17,3 +17,15 @@ Pull requests submitted through GitHub will be ignored. Validations are meant to verify functionality of tripleo systems. Therefore a special care should be given to testing your code before submitting a review. + +Branches and version management +=============================== +Validation Framework project uses semantic versioning and derives names of stable branches +from the released minor versions. The latest minor version released is the only exception +as it is derived from the `master` branch. + +Therefore, all code used by version 1.n.* of the project resides in `stable/1.n` branch, +and when version 1.(n+1) is released, new branch `stable/1.(n+1)` will be created. + +By default, stable branches recieve only bug fixes and feature backports are decided on case basis +after all the necessary discussions and procedures have taken place.