opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3631 from ioito/hotfix/qx-image-version-fix

Browse Source 
fix: 避免匹配到64导致version是6
This commit is contained in:
yunion-ci-robot
2019-11-13 19:45:19 +08:00
committed by GitHub
parent 4f97130c95 8b575a6198
commit ca64f5f23e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/imagetools/image_test.go
+6
View File
@@ -47,6 +47,12 @@ func TestNormalizeImageInfo(t *testing.T) {
OsType: "linux",
OsVersion: "14",
},
{
Name: "CentOS 7.2 64位",
OsDistro: "CentOS",
OsType: "linux",
OsVersion: "7",
},
}
for _, image := range images {
pkg/util/imagetools/imagetools.go
+9 -5
View File
@@ -70,6 +70,8 @@ func normalizeOsDistribution(osDist string, imageName string) string {
return "Aliyun"
} else if strings.Contains(osDist, "freebsd") {
return "FreeBSD"
} else if strings.Contains(osDist, "euleros") {
return "EulerOS"
} else if strings.Contains(osDist, "windows") {
if strings.Contains(osDist, "2003") {
return "Windows Server 2003"
@@ -89,13 +91,14 @@ func normalizeOsDistribution(osDist string, imageName string) string {
var imageVersions = map[string][]string{
"CentOS": {"5", "6", "7"},
"RHEL": {"5", "6", "7"},
"FreeBSD": {"10"},
"Ubuntu": {"10", "12", "14", "16", "18"},
"RHEL": {"5", "6", "7", "8"},
"FreeBSD": {"10", "11", "12"},
"Ubuntu": {"10", "12", "14", "16", "18", "19"},
"OpenSUSE": {"11", "12"},
"SUSE": {"10", "11", "12", "13"},
"Debian": {"6", "7", "8", "9"},
"Debian": {"6", "7", "8", "9", "10"},
"CoreOS": {"7"},
"EulerOS": {"2"},
"Aliyun": {},
}
@@ -107,7 +110,8 @@ func normalizeOsVersion(imageName string, osDist string, osVersion string) strin
return version
}
} else {
if strings.Contains(imageName, " "+version) || strings.Contains(imageName, "_"+version) {
imageName = strings.Replace(imageName, "64", "", -1)
if strings.Contains(imageName, " "+version) || strings.Contains(imageName, "_"+version) || strings.Contains(imageName, "-"+version) {
return version
}
}