From bf30976200e2ee56581ad0ad24d542485314a2d9 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <sotirakis.dim@gmail.com>
Date: Tue, 9 Aug 2022 11:20:45 +0300
Subject: [PATCH] Change from arm to armv7 (#53437)

---
 pkg/build/config/variant.go           |  1 +
 pkg/build/config/version_json_test.go | 10 +++++-----
 pkg/build/config/versions.go          | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/build/config/variant.go b/pkg/build/config/variant.go
index 8cbe3dc172f..f6263305cde 100644
--- a/pkg/build/config/variant.go
+++ b/pkg/build/config/variant.go
@@ -21,6 +21,7 @@ type Architecture string
 const (
 	ArchAMD64 Architecture = "amd64"
 	ArchARMv6 Architecture = "armv6"
+	ArchARMv7 Architecture = "armv7"
 	ArchARM64 Architecture = "arm64"
 	ArchARMHF Architecture = "armhf"
 	ArchARM   Architecture = "arm"
diff --git a/pkg/build/config/version_json_test.go b/pkg/build/config/version_json_test.go
index 4f64ea3eaff..43aec98d5cb 100644
--- a/pkg/build/config/version_json_test.go
+++ b/pkg/build/config/version_json_test.go
@@ -40,7 +40,7 @@ var configJSON = []byte(`{
       "archs": [
         "amd64",
         "arm64",
-        "arm"
+        "armv7"
       ]
     },
     "packagesBucket": "grafana-downloads",
@@ -67,7 +67,7 @@ var configJSON = []byte(`{
       "archs": [
         "amd64",
         "arm64",
-        "arm"
+        "armv7"
       ]
     },
     "packagesBucket": "grafana-downloads",
@@ -95,7 +95,7 @@ var configJSON = []byte(`{
       "archs": [
         "amd64",
         "arm64",
-        "arm"
+        "armv7"
       ]
     },
     "packagesBucket": "grafana-prerelease/artifacts/downloads",
@@ -125,7 +125,7 @@ var configJSON = []byte(`{
       "archs": [
         "amd64",
         "arm64",
-        "arm"
+        "armv7"
       ]
     },
     "packagesBucket": "grafana-prerelease/artifacts/downloads",
@@ -155,7 +155,7 @@ var configJSON = []byte(`{
       "archs": [
         "amd64",
         "arm64",
-        "arm"
+        "armv7"
       ]
     },
     "packagesBucket": "grafana-prerelease/artifacts/downloads",
diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go
index 61287c6c13e..a1294992482 100644
--- a/pkg/build/config/versions.go
+++ b/pkg/build/config/versions.go
@@ -40,7 +40,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				ArchARM, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
+				ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable.
 			},
 		},
 		PackagesBucket:  "grafana-downloads",
@@ -67,7 +67,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				ArchARM,
+				ArchARMv7,
 			},
 		},
 		PackagesBucket:            "grafana-downloads",
@@ -95,7 +95,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				ArchARM,
+				ArchARMv7,
 			},
 		},
 		PackagesBucket:  "grafana-prerelease/artifacts/downloads",
@@ -125,7 +125,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				ArchARM,
+				ArchARMv7,
 			},
 		},
 		PackagesBucket:  "grafana-prerelease/artifacts/downloads",
@@ -155,7 +155,7 @@ var Versions = VersionMap{
 			Architectures: []Architecture{
 				ArchAMD64,
 				ArchARM64,
-				ArchARM,
+				ArchARMv7,
 			},
 		},
 		PackagesBucket:  "grafana-prerelease/artifacts/downloads",