Coderabbit fixes

Author: bluesort

hack/generate.sh

@@ -138,11 +138,13 @@ with open("'"${data_file}"'") as f:
 
 arch_versions = defaultdict(set)
 for entry in data:
-    arch_versions[entry["cpu_architecture"]].add(entry["openshift_version"])
+    version = re.sub(r"-multi$", "", entry["openshift_version"])
+    parts = version.split(".")
+    version = "%s.%s" % (parts[0], parts[1])
+    arch_versions[entry["cpu_architecture"]].add(version)
 
 def sort_key(v):
-    numeric = re.sub(r"-multi$", "", v)
-    return tuple(int(p) for p in numeric.split(".") if p.isdigit())
+    return tuple(int(p) for p in v.split(".") if p.isdigit())
 
 lines = []
 for arch in sorted(arch_versions):

internal/common/test_versions.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/hashicorp/go-version"
 )
@@ -82,10 +81,10 @@ func (b *TestVersionBuilder) ReleaseImageURL() string {
 
 func (b *TestVersionBuilder) versions() []string {
 	all, ok := testVersionsByArch[b.arch]
-	if !ok || len(all) == 0 {
-		panic(fmt.Sprintf("no test versions defined for arch %q", b.arch))
+	if !ok {
+		return []string{}
 	}
-	if b.constraint == nil {
+	if b.constraint == nil || len(all) == 0 {
 		return all
 	}
 	var filtered []string
@@ -98,7 +97,7 @@ func (b *TestVersionBuilder) versions() []string {
 }
 
 func (b *TestVersionBuilder) parseVersion(v string) *version.Version {
-	parsed, err := version.NewVersion(strings.TrimSuffix(v, "-multi"))
+	parsed, err := version.NewVersion(v)
 	if err != nil {
 		panic(fmt.Sprintf("invalid version %q: %v", v, err))
 	}