revert aarch64 changes (#21)

* revert aarch64 * fmt
elastic · Feb 3, 2022 · 491085c · 491085c
1 parent 246153f
commit 491085c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -159,7 +159,7 @@ def withPackageLinuxEnv(Closure body) {
   def PLATFORMS = [ '+all',
                     'linux/amd64',
                     'linux/386',
-                    //'linux/arm64',
+                    'linux/arm64',
                     // armv7 packaging isn't working, and we don't currently
                     // need it for release. Do not re-enable it without
                     // confirming it is fixed, you will break the packaging

diff --git a/dev-tools/mage/pkgtypes.go b/dev-tools/mage/pkgtypes.go
@@ -149,7 +149,7 @@ var OSArchNames = map[string]map[PackageType]map[string]string{
 			"armv5":    "armv5",
 			"armv6":    "armv6",
 			"armv7":    "armv7",
-			"arm64":    "aarch64",
+			"arm64":    "arm64",
 			"mips":     "mips",
 			"mipsle":   "mipsel",
 			"mips64":   "mips64",

diff --git a/internal/pkg/artifact/artifact.go b/internal/pkg/artifact/artifact.go
@@ -15,7 +15,7 @@ import (
 var packageArchMap = map[string]string{
 	"linux-binary-32":    "linux-x86.tar.gz",
 	"linux-binary-64":    "linux-x86_64.tar.gz",
-	"linux-binary-arm64": "linux-aarch64.tar.gz",
+	"linux-binary-arm64": "linux-arm64.tar.gz",
 	"windows-binary-32":  "windows-x86.zip",
 	"windows-binary-64":  "windows-x86_64.zip",
 	"darwin-binary-32":   "darwin-x86_64.tar.gz",

diff --git a/internal/pkg/artifact/download/http/elastic_test.go b/internal/pkg/artifact/download/http/elastic_test.go
@@ -170,7 +170,7 @@ func getElasticCoClient() http.Client {
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "i686.rpm"):             struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "x86_64.rpm"):           struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-x86.tar.gz"):     struct{}{},
-		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-aarch64.tar.gz"): struct{}{},
+		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-arm64.tar.gz"):   struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-x86_64.tar.gz"):  struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "windows-x86.zip"):      struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "windows-x86_64.zip"):   struct{}{},

diff --git a/magefile.go b/magefile.go
@@ -388,7 +388,7 @@ func Package() {
 	}{
 		{"darwin/amd64", "darwin-x86_64.tar.gz"},
 		{"linux/amd64", "linux-x86_64.tar.gz"},
-		{"linux/arm64", "linux-aarch64.tar.gz"},
+		{"linux/arm64", "linux-arm64.tar.gz"},
 		{"windows/amd64", "windows-x86_64.zip"},
 	}