|
|
|
|
@ -1,9 +1,10 @@
|
|
|
|
|
From 1c161f5ae8b53c804d85f7184a6d7691356cb8da Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 2fc76a02b634a3660a5429c631ba41de5d43c495 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: tigro <tigro@msvsphere-os.ru>
|
|
|
|
|
Date: Sun, 13 Oct 2024 21:32:45 +0300
|
|
|
|
|
Subject: [PATCH] Added MSVSphere support
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
cmd/osbuild-composer/config.go | 2 ++
|
|
|
|
|
cmd/osbuild-composer/config_test.go | 6 ++++++
|
|
|
|
|
cmd/osbuild-composer/testdata/test.toml | 2 ++
|
|
|
|
|
repositories/msvsphere-810.json | 16 ++++++++++++++++
|
|
|
|
|
@ -15,15 +16,28 @@ Subject: [PATCH] Added MSVSphere support
|
|
|
|
|
.../images/pkg/distro/rhel/imagetype.go | 4 ++++
|
|
|
|
|
.../images/pkg/distro/rhel/rhel8/distro.go | 12 ++++++++----
|
|
|
|
|
.../images/pkg/distro/rhel/rhel9/distro.go | 12 ++++++++----
|
|
|
|
|
11 files changed, 127 insertions(+), 8 deletions(-)
|
|
|
|
|
12 files changed, 129 insertions(+), 8 deletions(-)
|
|
|
|
|
create mode 100644 repositories/msvsphere-810.json
|
|
|
|
|
create mode 100644 repositories/msvsphere-89.json
|
|
|
|
|
create mode 100644 repositories/msvsphere-93.json
|
|
|
|
|
create mode 100644 repositories/msvsphere-94.json
|
|
|
|
|
create mode 100644 repositories/msvsphere-95.json
|
|
|
|
|
|
|
|
|
|
diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go
|
|
|
|
|
index 4bed222..50dbf3e 100644
|
|
|
|
|
--- a/cmd/osbuild-composer/config.go
|
|
|
|
|
+++ b/cmd/osbuild-composer/config.go
|
|
|
|
|
@@ -128,6 +128,8 @@ func GetDefaultConfig() *ComposerConfigFile {
|
|
|
|
|
"rhel-8": "rhel-8.10",
|
|
|
|
|
"rhel-9": "rhel-9.5",
|
|
|
|
|
"rhel-10": "rhel-10.0",
|
|
|
|
|
+ "msvsphere-8": "msvsphere-8.10",
|
|
|
|
|
+ "msvsphere-9": "msvsphere-9.5",
|
|
|
|
|
},
|
|
|
|
|
LogLevel: "info",
|
|
|
|
|
LogFormat: "journal",
|
|
|
|
|
diff --git a/cmd/osbuild-composer/config_test.go b/cmd/osbuild-composer/config_test.go
|
|
|
|
|
index 2e7e999..33ddede 100644
|
|
|
|
|
index 2e7e999..2583cd0 100644
|
|
|
|
|
--- a/cmd/osbuild-composer/config_test.go
|
|
|
|
|
+++ b/cmd/osbuild-composer/config_test.go
|
|
|
|
|
@@ -74,6 +74,8 @@ func TestDefaultConfig(t *testing.T) {
|
|
|
|
|
@ -39,7 +53,7 @@ index 2e7e999..33ddede 100644
|
|
|
|
|
"rhel-7": "rhel-7.9", // this value is from the default config
|
|
|
|
|
"rhel-8": "rhel-8.9",
|
|
|
|
|
"rhel-9": "rhel-9.3",
|
|
|
|
|
+ "msvsphere-8": "msvsphere-8.10",
|
|
|
|
|
+ "msvsphere-8": "msvsphere-8.9",
|
|
|
|
|
+ "msvsphere-9": "msvsphere-9.3",
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, expectedDistroAliases, config.DistroAliases)
|
|
|
|
|
@ -54,14 +68,14 @@ index 2e7e999..33ddede 100644
|
|
|
|
|
|
|
|
|
|
config, err := LoadConfig("")
|
|
|
|
|
diff --git a/cmd/osbuild-composer/testdata/test.toml b/cmd/osbuild-composer/testdata/test.toml
|
|
|
|
|
index 2ba1b7a..29db5cd 100644
|
|
|
|
|
index 2ba1b7a..bd081a9 100644
|
|
|
|
|
--- a/cmd/osbuild-composer/testdata/test.toml
|
|
|
|
|
+++ b/cmd/osbuild-composer/testdata/test.toml
|
|
|
|
|
@@ -22,3 +22,5 @@ image_type_denylist = [ "qcow2" ]
|
|
|
|
|
[distro_aliases]
|
|
|
|
|
rhel-8 = "rhel-8.9"
|
|
|
|
|
rhel-9 = "rhel-9.3"
|
|
|
|
|
+msvsphere-8 = "msvsphere-8.10"
|
|
|
|
|
+msvsphere-8 = "msvsphere-8.9"
|
|
|
|
|
+msvsphere-9 = "msvsphere-9.3"
|
|
|
|
|
diff --git a/repositories/msvsphere-810.json b/repositories/msvsphere-810.json
|
|
|
|
|
new file mode 100644
|
|
|
|
|
|
