particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define distro alias for 'rhel-10'

Browse source 
Set it to RHEL-10.0.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-05-31 14:29:15 +02:00 • committed by Tomáš Hozza
parent f87f555362
commit 695febf39c
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/osbuild-composer/config.go
View file

@ -123,9 +123,10 @@ func GetDefaultConfig() *ComposerConfigFile {
}, },
}, },
DistroAliases: map[string]string{ DistroAliases: map[string]string{
"rhel-7": "rhel-7.9", "rhel-7": "rhel-7.9",
"rhel-8": "rhel-8.10", "rhel-8": "rhel-8.10",
"rhel-9": "rhel-9.4", "rhel-9": "rhel-9.4",
"rhel-10": "rhel-10.0",
}, },
LogLevel: "info", LogLevel: "info",
LogFormat: "text", LogFormat: "text",

14
cmd/osbuild-composer/config_test.go
View file

@ -70,9 +70,10 @@ func TestDefaultConfig(t *testing.T) {
require.Equal(t, expectedWeldrAPIConfig, defaultConfig.WeldrAPI) require.Equal(t, expectedWeldrAPIConfig, defaultConfig.WeldrAPI)
expectedDistroAliases := map[string]string{ expectedDistroAliases := map[string]string{
"rhel-7": "rhel-7.9", "rhel-10": "rhel-10.0",
"rhel-8": "rhel-8.10", "rhel-7": "rhel-7.9",
"rhel-9": "rhel-9.4", "rhel-8": "rhel-8.10",
"rhel-9": "rhel-9.4",
} }
require.Equal(t, expectedDistroAliases, defaultConfig.DistroAliases) require.Equal(t, expectedDistroAliases, defaultConfig.DistroAliases)
@ -108,9 +109,10 @@ func TestConfig(t *testing.T) {
// 'rhel-8' and 'rhel-9' aliases are overwritten by the config file // 'rhel-8' and 'rhel-9' aliases are overwritten by the config file
expectedDistroAliases := map[string]string{ expectedDistroAliases := map[string]string{
"rhel-7": "rhel-7.9", // this value is from the default config "rhel-10": "rhel-10.0", // this value is from the default config
"rhel-8": "rhel-8.9", "rhel-7": "rhel-7.9", // this value is from the default config
"rhel-9": "rhel-9.3", "rhel-8": "rhel-8.9",
"rhel-9": "rhel-9.3",
} }
require.Equal(t, expectedDistroAliases, config.DistroAliases) require.Equal(t, expectedDistroAliases, config.DistroAliases)
} }