From 67f51cefa0f1453edc803ba46702475ee253f284 Mon Sep 17 00:00:00 2001
From: ptrus <ptrusr@gmail.com>
Date: Wed, 10 Jun 2020 10:19:05 +0200
Subject: [PATCH] release-process: create a stable branch when preparing a new
 release

Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.
---
 .changelog/2993.process.md |  7 +++++++
 docs/release-process.md    | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 .changelog/2993.process.md

diff --git a/.changelog/2993.process.md b/.changelog/2993.process.md
new file mode 100644
index 00000000000..d6b5709751f
--- /dev/null
+++ b/.changelog/2993.process.md
@@ -0,0 +1,7 @@
+release: create a stable branch when preparing a new release
+
+Currently we create a stable release branch only once we need to backport some
+changes. This PR changes the release process to create the stable branch when
+creating a new release. This will ensure CI jobs hooked to stable/ branches,
+such as building a release tagged CI docker image will be run for every
+release.
diff --git a/docs/release-process.md b/docs/release-process.md
index 50c0766e47e..ce87f84d6d2 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -106,6 +106,15 @@ while tagging the next release.
 
 After those checks have passed, it will ask for confirmation before proceeding.
 
+### Create a `stable/YY.MINOR.x` branch
+
+Prepare a new stable branch from the tag and push it to the origin:
+
+```bash
+git checkout -b stable/${YY}.${TAG_MINOR}.x v${TAG_VERSION}
+git push -u origin stable/${YY}.${TAG_MINOR}.x
+```
+
 ### Ensure a GitHub release was published
 
 After the tag with the next release is pushed to the [canonical git repository],
@@ -140,15 +149,6 @@ BACKPORT_VERSION="20.1"
 
 [Versioning scheme]: versioning.md
 
-### Create a `stable/YY.MINOR.x` branch
-
-Prepare a new branch from the appropriate tag and push it to the origin:
-
-```bash
-git checkout -b stable/${BACKPORT_VERSION}.x v${BACKPORT_VERSION}
-git push -u origin stable/${BACKPORT_VERSION}.x
-```
-
 ### Back-port the changes
 
 Create a new branch, e.g.