From 698cb39e80e04e35e0557429014df97c542c42b2 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 9 Sep 2024 15:01:44 -0400 Subject: [PATCH] rhel-9.4/c9s: make versioning scheme semver compatible There's a bunch of things out there that currently parse the RHCOS version string. The semantics of this string will change as part of this change, but we should at least try to retain the same semver-compatible format. E.g. currently, an RHCOS version string of the `ocp-rhel-9.4` variant is 418.94.202409090849-0. Before this PR, An RHCOS version string of the `rhel-9.4` variant is 9.4.202409090849.0, which is not semver compatible. With this PR, the latter would now be 9.4.202409090849-0 (note the change from `.0` to `-0`). --- manifest-c9s.yaml | 2 ++ manifest-rhel-9.4.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index 899eef66..c3069b2e 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -21,6 +21,8 @@ repos: # In that case, the versioning should instead be exactly the same as the pungi # compose ID. automatic-version-prefix: "9." +# This ensures we're semver-compatible which OpenShift wants +automatic-version-suffix: "-" mutate-os-release: "9" diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml index 694e5406..6a2cb4e1 100644 --- a/manifest-rhel-9.4.yaml +++ b/manifest-rhel-9.4.yaml @@ -20,6 +20,8 @@ repos: # In that case, the versioning should instead be exactly the same as the pungi # compose ID. automatic-version-prefix: "9.4." +# This ensures we're semver-compatible which OpenShift wants +automatic-version-suffix: "-" mutate-os-release: "9.4"