Merge pull request #126 from ioito/hotfix/qx-uos-dist

fix(imagetools): uos dist
yunionio · May 10, 2024 · 8203b24 · 8203b24
2 parents e4ad08e + f0e59a6
commit 8203b24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/util/imagetools/image_test.go b/util/imagetools/image_test.go
@@ -133,6 +133,14 @@ func TestNormalizeImageInfo(t *testing.T) {
 			OsLang:    "",
 			OsArch:    "x86_64",
 		},
+		{
+			Name:      "UOS 20 1050 Hygon 64位",
+			OsDistro:  "UOS",
+			OsType:    osprofile.OS_TYPE_LINUX,
+			OsVersion: "20 1050",
+			OsLang:    "",
+			OsArch:    "x86_64",
+		},
 	}
 
 	for _, image := range images {

diff --git a/util/imagetools/imagetools.go b/util/imagetools/imagetools.go
@@ -114,6 +114,8 @@ func normalizeOsDistribution(osDist string, imageName string) string {
 		return "Amazon Linux"
 	} else if strings.Contains(osDist, "kylin") {
 		return "Kylin"
+	} else if strings.Contains(osDist, "uos") {
+		return "UOS"
 	} else if strings.Contains(osDist, "windows") {
 		for _, ver := range []string{"2003", "2008", "2012", "2016", "2019", "2022"} {
 			if strings.Contains(osDist, ver) {
@@ -154,6 +156,7 @@ var imageVersions = map[string][]string{
 	"Windows":        {"XP", "7", "8", "Vista", "10", "11"},
 
 	"Kylin": {"V10"},
+	"UOS":   {"V20", "20 1050", "1050", "1060", "1070"},
 }
 
 func normalizeOsVersion(imageName string, osDist string, osVersion string) string {