From 586d545db100de5e9eca5d70ad4f265a2ddad7da Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Wed, 17 May 2023 10:35:05 +0200
Subject: [PATCH] build: Add patch digit in MetalK8s sosreport package version

---
 CHANGELOG.md                      | 6 ++++++
 buildchain/buildchain/versions.py | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba7cef5845..82cf084c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # CHANGELOG
 ## Release 124.1.6 (in development)
 
+### Bug fixes
+
+- Ensure metalk8s-sosreport package get upgraded on each patch version.
+  Changes metalk8s-sosreport package version to add the `patch` digit
+  (PR[#4056](https://github.com/scality/metalk8s/pull/4056))
+
 ## Release 124.1.5
 
 ### Enhancements
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index b27b1b2e24..7b24957b4a 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -51,8 +51,9 @@ def load_version_information() -> None:
 
 load_version_information()
 
-SHORT_VERSION: str = "{}.{}".format(VERSION_MAJOR, VERSION_MINOR)
-VERSION: str = "{}.{}{}".format(SHORT_VERSION, VERSION_PATCH, VERSION_SUFFIX)
+SHORT_VERSION: str = f"{VERSION_MAJOR}.{VERSION_MINOR}"
+NONSUFFIXED_VERSION: str = f"{SHORT_VERSION}.{VERSION_PATCH}"
+VERSION: str = f"{NONSUFFIXED_VERSION}{VERSION_SUFFIX}"
 
 # Get shell ui version from package.json
 shell_ui_package_contents = (REPO_ROOT / "shell-ui/package.json").read_text(
@@ -400,7 +401,7 @@ def rpm_full_name(self) -> str:
             PackageVersion(name="container-selinux"),  # TODO #1710
             PackageVersion(
                 name="metalk8s-sosreport",
-                version=SHORT_VERSION,
+                version=NONSUFFIXED_VERSION,
                 release="{0}.el7".format(SOSREPORT_RELEASE),
             ),
             PackageVersion(name="yum-plugin-versionlock"),
@@ -415,7 +416,7 @@ def rpm_full_name(self) -> str:
             PackageVersion(name="iptables-ebtables", override="ebtables"),
             PackageVersion(
                 name="metalk8s-sosreport",
-                version=SHORT_VERSION,
+                version=NONSUFFIXED_VERSION,
                 release="{0}.el8".format(SOSREPORT_RELEASE),
             ),
             PackageVersion(name="python3-m2crypto", override="m2crypto"),