From 985e582953b9d9cfb6ddd2ee763a639e3670b8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Thu, 27 Feb 2025 12:45:15 +0100 Subject: [PATCH] osbuild-composer/config: update distro aliases for RHEL 9 and 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the `rhel-9` and `rhel-10` distro aliases to the next in-development releases, because we don't plan to land any new releases in 9.6 or 10.0. Signed-off-by: Tomáš Hozza --- cmd/osbuild-composer/config.go | 4 ++-- cmd/osbuild-composer/config_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go index 05ec7c1bb..5f2b0ddde 100644 --- a/cmd/osbuild-composer/config.go +++ b/cmd/osbuild-composer/config.go @@ -127,8 +127,8 @@ func GetDefaultConfig() *ComposerConfigFile { DistroAliases: map[string]string{ "rhel-7": "rhel-7.9", "rhel-8": "rhel-8.10", - "rhel-9": "rhel-9.6", - "rhel-10": "rhel-10.0", + "rhel-9": "rhel-9.7", + "rhel-10": "rhel-10.1", }, LogLevel: "info", LogFormat: "journal", diff --git a/cmd/osbuild-composer/config_test.go b/cmd/osbuild-composer/config_test.go index f26d1db3f..8f22e9c99 100644 --- a/cmd/osbuild-composer/config_test.go +++ b/cmd/osbuild-composer/config_test.go @@ -70,10 +70,10 @@ func TestDefaultConfig(t *testing.T) { require.Equal(t, expectedWeldrAPIConfig, defaultConfig.WeldrAPI) expectedDistroAliases := map[string]string{ - "rhel-10": "rhel-10.0", + "rhel-10": "rhel-10.1", "rhel-7": "rhel-7.9", "rhel-8": "rhel-8.10", - "rhel-9": "rhel-9.6", + "rhel-9": "rhel-9.7", } require.Equal(t, expectedDistroAliases, defaultConfig.DistroAliases) @@ -109,7 +109,7 @@ func TestConfig(t *testing.T) { // 'rhel-8' and 'rhel-9' aliases are overwritten by the config file expectedDistroAliases := map[string]string{ - "rhel-10": "rhel-10.0", // this value is from the default config + "rhel-10": "rhel-10.1", // this value is from the default config "rhel-7": "rhel-7.9", // this value is from the default config "rhel-8": "rhel-8.9", "rhel-9": "rhel-9.3", @@ -175,7 +175,7 @@ func TestConfigFromEnv(t *testing.T) { "rhel-7": "rhel-7.9", "rhel-8": "rhel-8.9", "rhel-9": "rhel-9.3", - "rhel-10": "rhel-10.0", // this value is from the default config + "rhel-10": "rhel-10.1", // this value is from the default config } config, err := LoadConfig("")