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

osbuild-composer/config: update distro aliases for RHEL 9 and 10

Browse source 
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 <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-02-27 12:45:15 +01:00 • committed by Tomáš Hozza
parent 8a4f093af6
commit 985e582953
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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",

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

@ -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("")