Grafana versioning: Remove pre suffix from Grafana version (#73357)

* Remove pre suffix from version

* Fix tests

pkg/build/config/genmetadata_test.go

@@ -18,7 +18,7 @@ const (
 )
 
 const (
-	hashedGrafanaVersion = "9.2.0-12345pre"
+	hashedGrafanaVersion = "9.2.0-12345"
 	versionedBranch      = "v9.2.x"
 )
 

pkg/build/config/version.go

@@ -81,9 +81,6 @@ func GenerateGrafanaVersion(buildID, grafanaDir string) (string, error) {
 		buildID = shortenBuildID(buildID)
 		verComponents := strings.Split(version, "-")
 		version = verComponents[0]
-		if len(verComponents) > 1 {
-			buildID = fmt.Sprintf("%s%s", buildID, verComponents[1])
-		}
 		version = fmt.Sprintf("%s-%s", version, buildID)
 	}