Merge pull request #379 from CuZn13/master

k8s-ci-robot · web-flow · commit 3ace8c2984f5 · 2019-11-13T17:47:35.000-08:00
add a case is ID="centos"
diff --git a/pkg/util/helpers.go b/pkg/util/helpers.go
@@ -89,6 +89,8 @@ func GetOSVersion() (string, error) {
 		return getDebianVersion(osReleaseMap), nil
 	case "ubuntu":
 		return getDebianVersion(osReleaseMap), nil
+	case "centos":
+		return getDebianVersion(osReleaseMap), nil
 	default:
 		return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])
 	}
diff --git a/pkg/util/helpers_test.go b/pkg/util/helpers_test.go
@@ -161,6 +161,12 @@ func TestGetOSVersion(t *testing.T) {
 			expectedOSVersion: "ubuntu 16.04.6 LTS (Xenial Xerus)",
 			expectErr:         false,
 		},
+		{
+			name:              "centos",
+			fakeOSReleasePath: "testdata/os-release-centos",
+			expectedOSVersion: "centos 7 (Core)",
+			expectErr:         false,
+		},
 		{
 			name:              "Unknown",
 			fakeOSReleasePath: "testdata/os-release-unknown",
diff --git a/pkg/util/testdata/os-release-centos b/pkg/util/testdata/os-release-centos
@@ -0,0 +1,15 @@
+NAME="CentOS Linux"
+VERSION="7 (Core)"
+ID="centos"
+ID_LIKE="rhel fedora"
+VERSION_ID="7"
+PRETTY_NAME="CentOS Linux 7 (Core)"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:centos:centos:7"
+HOME_URL="https://www.centos.org/"
+BUG_REPORT_URL="https://bugs.centos.org/"
+
+CENTOS_MANTISBT_PROJECT="CentOS-7"
+CENTOS_MANTISBT_PROJECT_VERSION="7"
+REDHAT_SUPPORT_PRODUCT="centos"
+REDHAT_SUPPORT_PRODUCT_VERSION="7"

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ func GetOSVersion() (string, error) {`
`89`	`89`	`return getDebianVersion(osReleaseMap), nil`
`90`	`90`	`case "ubuntu":`
`91`	`91`	`return getDebianVersion(osReleaseMap), nil`
	`92`	`+ case "centos":`
	`93`	`+ return getDebianVersion(osReleaseMap), nil`
`92`	`94`	`default:`
`93`	`95`	`return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])`
`94`	`96`	`}`