fix move packages for pro-rpi (#149)

grafana · Aug 31, 2023 · c5d99cf · c5d99cf
1 parent 0dd80ff
commit c5d99cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/scripts/move_packages.go b/scripts/move_packages.go
@@ -17,6 +17,7 @@ import (
 )
 
 const (
+	proName = "enterprise2"
 	// 1: The version (with a v prefix)
 	// 2: The "edition". Options: 'oss', 'pro', 'enterprise'.
 	// 3: The full name. 'grafana', 'grafana-enterprise', 'grafana-pro
@@ -128,7 +129,7 @@ func RPMHandler(name string) []string {
 	if edition == "pro" {
 		// "pro" in this case is called "enterprise2"
 		fullName = "grafana-enterprise2"
-		edition = "enterprise2"
+		edition = proName
 		// and is in the 'downloads-enterprise2' folder instead of 'downloads'
 		enterprise2 = "-enterprise2"
 		// and has an period separator {version}.{arch} instead of {version}_{arch}
@@ -181,7 +182,15 @@ func DebHandler(name string) []string {
 		if edition == "pro" {
 			// "pro" in this case is called "enterprise2"
 			fullName = "grafana-enterprise2"
-			edition = "enterprise2"
+			edition = proName
+			// and is in the 'downloads-enterprise2' folder instead of 'downloads'
+			enterprise2 = "-enterprise2"
+		}
+
+		if edition == "pro-rpi" {
+			// "pro" in this case is called "enterprise2"
+			fullName = "grafana-enterprise2-rpi"
+			edition = proName
 			// and is in the 'downloads-enterprise2' folder instead of 'downloads'
 			enterprise2 = "-enterprise2"
 		}
@@ -239,7 +248,7 @@ func TarGZHandler(name string) []string {
 		if edition == "pro" {
 			enterprise2 = "-enterprise2"
 			fullName = "grafana-enterprise2"
-			edition = "enterprise2"
+			edition = proName
 		}
 	}
 
@@ -292,7 +301,7 @@ func DockerHandler(name string) []string {
 	if opts.Edition != "" {
 		edition = opts.Edition
 		if edition == "pro" {
-			edition = "enterprise2"
+			edition = proName
 		}
 	}
 

diff --git a/scripts/move_packages_deb_test.go b/scripts/move_packages_deb_test.go
@@ -96,6 +96,12 @@ var debMapping = []m{
 			"artifacts/downloads/v1.2.3/enterprise/release/grafana-enterprise_1.2.3_armhf.deb.sha256",
 		},
 	},
+	{
+		input: "gs://bucket/tag/grafana-pro-rpi_v1.2.3_102_linux_arm-7.deb",
+		output: []string{
+			"artifacts/downloads-enterprise2/v1.2.3/enterprise2/release/grafana-enterprise2-rpi_1.2.3_armhf.deb",
+		},
+	},
 	{
 		input: "gs://bucket/tag/grafana-pro_v1.2.3-pre.4_102_linux_amd64.deb",
 		output: []string{