Standardize elasticsearch amd64 image artifact names

We want to sync across the stack on architecture naming and artifact names
containing architecture information

Author: breskeby

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle

@@ -15,7 +15,7 @@ subprojects {
         archiveBaseName.set("elasticsearch${project.name.startsWith('oss')?'-oss':''}")
         def versionFromBranch = calculateBranchVersion()
         archiveVersion.set("${versionFromBranch}-SNAPSHOT")
-        archiveClassifier.set("darwin-x86_64")
+        archiveClassifier.set("darwin-amd64")
         archiveExtension.set('tar.gz')
     }
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

@@ -179,7 +179,7 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
         Architecture architecture = distribution.getArchitecture();
         String projectName = "";
 
-        final String archString = platform == ElasticsearchDistribution.Platform.WINDOWS || architecture == Architecture.X64
+        final String archString = platform == ElasticsearchDistribution.Platform.WINDOWS || architecture == Architecture.AMD64
             ? ""
             : "-" + architecture.toString().toLowerCase();
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

@@ -256,7 +256,8 @@ private static String distroId(ElasticsearchDistributionType type, Platform plat
             + (type == ARCHIVE ? platform + "-" : "")
             + type.getName()
             + (bundledJdk ? "" : "-no-jdk")
-            + (architecture == Architecture.X64 ? "" : "-" + architecture.toString().toLowerCase());
+            + "-"
+            + architecture.toString().toLowerCase();
     }
 
     private static String destructiveDistroTestTaskName(ElasticsearchDistribution distro) {

build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java

@@ -11,7 +11,7 @@
 
 public enum Architecture {
 
-    X64("x86_64", "linux/amd64"),
+    AMD64("amd64", "linux/amd64"),
     AARCH64("aarch64", "linux/arm64");
 
     public final String classifier;
@@ -25,7 +25,7 @@ public enum Architecture {
     public static Architecture current() {
         final String architecture = System.getProperty("os.arch", "");
         return switch (architecture) {
-            case "amd64", "x86_64" -> X64;
+            case "amd64", "x86_64" -> AMD64;
             case "aarch64" -> AARCH64;
             default -> throw new IllegalArgumentException("can not determine architecture from [" + architecture + "]");
         };

distribution/archives/build.gradle

@@ -91,14 +91,14 @@ distribution_archives {
   }
 
   windowsZip {
-    archiveClassifier = 'windows-x86_64'
+    archiveClassifier = 'windows-amd64'
     content {
       archiveFiles('zip', 'windows', 'x64', false)
     }
   }
 
   darwinTar {
-    archiveClassifier = 'darwin-x86_64'
+    archiveClassifier = 'darwin-amd64'
     content {
       archiveFiles('tar', 'darwin', 'x64', false)
     }
@@ -119,7 +119,7 @@ distribution_archives {
   }
 
   linuxTar {
-    archiveClassifier = 'linux-x86_64'
+    archiveClassifier = 'linux-amd64'
     content {
       archiveFiles('tar', 'linux', 'x64', false)
     }

distribution/docker/build.gradle

@@ -98,12 +98,12 @@ configurations {
   allPlugins
   filebeat_aarch64
   filebeat_fips_aarch64
-  filebeat_x86_64
-  filebeat_fips_x86_64
+  filebeat_amd64
+  filebeat_fips_amd64
   metricbeat_aarch64
   metricbeat_fips_aarch64
-  metricbeat_x86_64
-  metricbeat_fips_x86_64
+  metricbeat_amd64
+  metricbeat_fips_amd64
   fips
 }
 
@@ -119,15 +119,15 @@ dependencies {
   allPlugins project(path: ':plugins', configuration: 'allPlugins')
   allPlugins project(path: ':x-pack:extras:plugins', configuration: 'allPlugins')
   filebeat_aarch64 "beats:filebeat:${VersionProperties.elasticsearch}:[email protected]"
-  filebeat_x86_64 "beats:filebeat:${VersionProperties.elasticsearch}:linux-x86_64@tar.gz"
+  filebeat_amd64 "beats:filebeat:${VersionProperties.elasticsearch}:linux-amd64@tar.gz"
   filebeat_fips_aarch64 "beats:filebeat-fips:${VersionProperties.elasticsearch}:[email protected]"
-  filebeat_fips_x86_64 "beats:filebeat-fips:${VersionProperties.elasticsearch}:linux-x86_64@tar.gz"
+  filebeat_fips_amd64 "beats:filebeat-fips:${VersionProperties.elasticsearch}:linux-amd64@tar.gz"
 
   metricbeat_aarch64 "beats:metricbeat:${VersionProperties.elasticsearch}:[email protected]"
-  metricbeat_x86_64 "beats:metricbeat:${VersionProperties.elasticsearch}:linux-x86_64@tar.gz"
+  metricbeat_amd64 "beats:metricbeat:${VersionProperties.elasticsearch}:linux-amd64@tar.gz"
 
   metricbeat_fips_aarch64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:[email protected]"
-  metricbeat_fips_x86_64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:linux-x86_64@tar.gz"
+  metricbeat_fips_amd64 "beats:metricbeat-fips:${VersionProperties.elasticsearch}:linux-amd64@tar.gz"
 
   fips "org.bouncycastle:bc-fips:1.0.2.5"
   fips "org.bouncycastle:bctls-fips:1.0.19"
@@ -607,7 +607,7 @@ subprojects { Project subProject ->
   if (subProject.name.endsWith('-export')) {
     apply plugin: 'distribution'
 
-    final Architecture architecture = subProject.name.contains('aarch64-') ? Architecture.AARCH64 : Architecture.X64
+    final Architecture architecture = subProject.name.contains('aarch64-') ? Architecture.AARCH64 : Architecture.AMD64
     DockerBase base = DockerBase.DEFAULT
     if (subProject.name.contains('ironbank-')) {
       base = DockerBase.IRON_BANK

distribution/packages/build.gradle

@@ -121,7 +121,7 @@ def commonPackageConfig(String type, String architecture) {
 
     // top level "into" directive is not inherited from ospackage for some reason, so we must
     // specify it again explicitly for copying common files
-    String platform = 'linux-' + ((architecture == 'x64') ? 'x86_64' : architecture)
+    String platform = 'linux-' + ((architecture == 'x64') ? 'amd64' : architecture)
     into('/usr/share/elasticsearch') {
       into('bin') {
         with binFiles(type, false)