Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Add patch digit in MetalK8s sosreport package version #4056

Merged
merged 1 commit into from
May 17, 2023
Merged

build: Add patch digit in MetalK8s sosreport package version #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions buildchain/buildchain/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down