distro/rhel: use dot to separate minor version in distro name

Let's be consistent and use the dot in the distro name to separate major and minor version. Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Dec 20, 2023 · 0f0a0d1 · 0f0a0d1
1 parent f23f2b0
commit 0f0a0d1
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 45 deletions.
diff --git a/pkg/distro/rhel7/distro.go b/pkg/distro/rhel7/distro.go
@@ -183,7 +183,7 @@ func newDistro(name string, minor int) *distribution {
 	switch name {
 	case "rhel":
 		rd = distribution{
-			name:               fmt.Sprintf("rhel-7%d", minor),
+			name:               fmt.Sprintf("rhel-7.%d", minor),
 			product:            "Red Hat Enterprise Linux",
 			osVersion:          fmt.Sprintf("7.%d", minor),
 			nick:               "Maipo",

diff --git a/pkg/distro/rhel7/distro_test.go b/pkg/distro/rhel7/distro_test.go
@@ -257,7 +257,7 @@ func TestRhel7_GetArch(t *testing.T) {
 
 func TestRhel7_Name(t *testing.T) {
 	distro := rhelFamilyDistros[0].distro
-	assert.Equal(t, "rhel-79", distro.Name())
+	assert.Equal(t, "rhel-7.9", distro.Name())
 }
 
 func TestRhel7_ModulePlatformID(t *testing.T) {

diff --git a/pkg/distro/rhel8/distro.go b/pkg/distro/rhel8/distro.go
@@ -128,7 +128,7 @@ func newDistro(name string, minor int) *distribution {
 	switch name {
 	case "rhel":
 		rd = distribution{
-			name:               fmt.Sprintf("rhel-8%d", minor),
+			name:               fmt.Sprintf("rhel-8.%d", minor),
 			product:            "Red Hat Enterprise Linux",
 			osVersion:          fmt.Sprintf("8.%d", minor),
 			releaseVersion:     "8",

diff --git a/pkg/distro/rhel8/distro_test.go b/pkg/distro/rhel8/distro_test.go
@@ -638,7 +638,7 @@ func TestRHEL8_GetArch(t *testing.T) {
 
 func TestRhel8_Name(t *testing.T) {
 	distro := rhelFamilyDistros[0].distro
-	assert.Equal(t, "rhel-810", distro.Name())
+	assert.Equal(t, "rhel-8.10", distro.Name())
 }
 
 func TestRhel8_ModulePlatformID(t *testing.T) {

diff --git a/pkg/distro/rhel9/distro.go b/pkg/distro/rhel9/distro.go
@@ -130,7 +130,7 @@ func newDistro(name string, minor int) *distribution {
 	switch name {
 	case "rhel":
 		rd = distribution{
-			name:               fmt.Sprintf("rhel-9%d", minor),
+			name:               fmt.Sprintf("rhel-9.%d", minor),
 			product:            "Red Hat Enterprise Linux",
 			osVersion:          fmt.Sprintf("9.%d", minor),
 			releaseVersion:     "9",

diff --git a/pkg/distro/rhel9/distro_test.go b/pkg/distro/rhel9/distro_test.go
@@ -637,7 +637,7 @@ func TestRhel9_GetArch(t *testing.T) {
 
 func TestRhel9_Name(t *testing.T) {
 	distro := rhelFamilyDistros[0].distro
-	assert.Equal(t, "rhel-94", distro.Name())
+	assert.Equal(t, "rhel-9.4", distro.Name())
 }
 
 func TestRhel9_ModulePlatformID(t *testing.T) {

diff --git a/pkg/distrofactory/distrofactory_test.go b/pkg/distrofactory/distrofactory_test.go
@@ -15,31 +15,31 @@ func TestGetDistroDefaultList(t *testing.T) {
 	testCases := []testCase{
 		{
 			strID:              "rhel-7.9",
-			expectedDistroName: "rhel-79",
+			expectedDistroName: "rhel-7.9",
 		},
 		{
 			strID:              "rhel-89",
-			expectedDistroName: "rhel-89",
+			expectedDistroName: "rhel-8.9",
 		},
 		{
 			strID:              "rhel-8.9",
-			expectedDistroName: "rhel-89",
+			expectedDistroName: "rhel-8.9",
 		},
 		{
 			strID:              "rhel-810",
-			expectedDistroName: "rhel-810",
+			expectedDistroName: "rhel-8.10",
 		},
 		{
 			strID:              "rhel-8.10",
-			expectedDistroName: "rhel-810",
+			expectedDistroName: "rhel-8.10",
 		},
 		{
 			strID:              "rhel-91",
-			expectedDistroName: "rhel-91",
+			expectedDistroName: "rhel-9.1",
 		},
 		{
 			strID:              "rhel-9.1",
-			expectedDistroName: "rhel-91",
+			expectedDistroName: "rhel-9.1",
 		},
 		{
 			strID:              "fedora-38",

diff --git a/test/config-map.json b/test/config-map.json
@@ -12,11 +12,11 @@
   },
   "./configs/all-with-oscap.json": {
     "distros": [
-      "rhel-91",
-      "rhel-92",
-      "rhel-87",
-      "rhel-88",
-      "rhel-89",
+      "rhel-9.1",
+      "rhel-9.2",
+      "rhel-8.7",
+      "rhel-8.8",
+      "rhel-8.9",
       "centos*",
       "fedora*"
     ],
@@ -26,10 +26,10 @@
   },
   "./configs/all-with-fips.json": {
     "distros": [
-      "rhel-93",
-      "rhel-94",
-      "rhel-89",
-      "rhel-810",
+      "rhel-9.3",
+      "rhel-9.4",
+      "rhel-8.9",
+      "rhel-8.10",
       "centos*",
       "fedora*"
     ],
@@ -39,7 +39,7 @@
   },
   "./configs/disable-lm_sensors.json": {
     "distros": [
-      "rhel-84"
+      "rhel-8.4"
     ],
     "image-types": [
       "ec2-sap"
@@ -52,8 +52,8 @@
   },
   "./configs/edge-ostree-pull-device-fips.json": {
     "distros": [
-      "rhel-93",
-      "rhel-94"
+      "rhel-9.3",
+      "rhel-9.4"
     ],
     "image-types": [
       "edge-simplified-installer"
@@ -66,10 +66,10 @@
       "edge-vsphere"
     ]
   },
- "./configs/edge-ostree-pull-fips.json": {
+  "./configs/edge-ostree-pull-fips.json": {
     "distros": [
-      "rhel-93",
-      "rhel-94"
+      "rhel-9.3",
+      "rhel-9.4"
     ],
     "image-types": [
       "edge-installer",
@@ -84,8 +84,8 @@
   },
   "./configs/edge-ostree-pull-user-fips.json": {
     "distros": [
-      "rhel-93",
-      "rhel-94"
+      "rhel-9.3",
+      "rhel-9.4"
     ],
     "image-types": [
       "edge-ami"
@@ -188,18 +188,18 @@
       "fedora-38",
       "fedora-39",
       "fedora-40",
-      "rhel-79",
-      "rhel-810",
-      "rhel-85",
-      "rhel-86",
-      "rhel-87",
-      "rhel-88",
-      "rhel-89",
-      "rhel-90",
-      "rhel-91",
-      "rhel-92",
-      "rhel-93",
-      "rhel-94"
+      "rhel-7.9",
+      "rhel-8.10",
+      "rhel-8.5",
+      "rhel-8.6",
+      "rhel-8.7",
+      "rhel-8.8",
+      "rhel-8.9",
+      "rhel-9.0",
+      "rhel-9.1",
+      "rhel-9.2",
+      "rhel-9.3",
+      "rhel-9.4"
     ],
     "image-types": [
       "ec2-sap"
@@ -213,9 +213,9 @@
       "simplified-installer"
     ],
     "distros": [
-      "rhel-92",
-      "rhel-93",
-      "rhel-94"
+      "rhel-9.2",
+      "rhel-9.3",
+      "rhel-9.4"
     ]
   }
 }
diff --git a/test/data/repositories/rhel-79.json → test/data/repositories/rhel-7.9.json b/test/data/repositories/rhel-79.json → test/data/repositories/rhel-7.9.json
diff --git a/test/data/repositories/rhel-810.json → test/data/repositories/rhel-8.10.json b/test/data/repositories/rhel-810.json → test/data/repositories/rhel-8.10.json
diff --git a/test/data/repositories/rhel-84.json → test/data/repositories/rhel-8.4.json b/test/data/repositories/rhel-84.json → test/data/repositories/rhel-8.4.json
diff --git a/test/data/repositories/rhel-85.json → test/data/repositories/rhel-8.5.json b/test/data/repositories/rhel-85.json → test/data/repositories/rhel-8.5.json
diff --git a/test/data/repositories/rhel-86.json → test/data/repositories/rhel-8.6.json b/test/data/repositories/rhel-86.json → test/data/repositories/rhel-8.6.json
diff --git a/test/data/repositories/rhel-87.json → test/data/repositories/rhel-8.7.json b/test/data/repositories/rhel-87.json → test/data/repositories/rhel-8.7.json
diff --git a/test/data/repositories/rhel-88.json → test/data/repositories/rhel-8.8.json b/test/data/repositories/rhel-88.json → test/data/repositories/rhel-8.8.json
diff --git a/test/data/repositories/rhel-89.json → test/data/repositories/rhel-8.9.json b/test/data/repositories/rhel-89.json → test/data/repositories/rhel-8.9.json
diff --git a/test/data/repositories/rhel-90.json → test/data/repositories/rhel-9.0.json b/test/data/repositories/rhel-90.json → test/data/repositories/rhel-9.0.json
diff --git a/test/data/repositories/rhel-91.json → test/data/repositories/rhel-9.1.json b/test/data/repositories/rhel-91.json → test/data/repositories/rhel-9.1.json
diff --git a/test/data/repositories/rhel-92.json → test/data/repositories/rhel-9.2.json b/test/data/repositories/rhel-92.json → test/data/repositories/rhel-9.2.json
diff --git a/test/data/repositories/rhel-93.json → test/data/repositories/rhel-9.3.json b/test/data/repositories/rhel-93.json → test/data/repositories/rhel-9.3.json
diff --git a/test/data/repositories/rhel-94.json → test/data/repositories/rhel-9.4.json b/test/data/repositories/rhel-94.json → test/data/repositories/rhel-9.4.json