Merge branch 'bugfix/update-sosreport-package-version' into tmp/octop…

…us/w/125.0/bugfix/update-sosreport-package-version

CHANGELOG.md

@@ -142,6 +142,12 @@
 
 ## 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

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(
@@ -389,7 +390,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"),
@@ -404,7 +405,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"),