Reflect Architecture in distribution subproject names

Author: breskeby

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.AMD64
+        final String archString = platform == ElasticsearchDistribution.Platform.WINDOWS
             ? ""
             : "-" + architecture.toString().toLowerCase();
 

distribution/archives/build.gradle

@@ -97,7 +97,7 @@ distribution_archives {
     }
   }
 
-  darwinTar {
+  darwinAmd64Tar {
     archiveClassifier = 'darwin-amd64'
     content {
       archiveFiles('tar', 'darwin', 'x64', false)
@@ -118,7 +118,7 @@ distribution_archives {
     }
   }
 
-  linuxTar {
+  linuxAmd64Tar {
     archiveClassifier = 'linux-amd64'
     content {
       archiveFiles('tar', 'linux', 'x64', false)

distribution/archives/darwin-tar/build.gradle renamed to distribution/archives/darwin-amd64-tar/build.gradle

@@ -630,12 +630,12 @@ subprojects {
 }
 
 ['archives:windows-zip',
- 'archives:darwin-tar',
+ 'archives:darwin-amd64-tar',
  'archives:darwin-aarch64-tar',
  'archives:linux-aarch64-tar',
- 'archives:linux-tar',
+ 'archives:linux-amd64-tar',
  'archives:integ-test-zip',
- 'packages:rpm', 'packages:deb',
+ 'packages:amd64-rpm', 'packages:amd64-deb',
  'packages:aarch64-rpm', 'packages:aarch64-deb',
 ].forEach { subName ->
   Project subproject = project("${project.path}:${subName}")

distribution/archives/linux-tar/build.gradle renamed to distribution/archives/linux-amd64-tar/build.gradle

@@ -112,8 +112,8 @@ String tiniArch = Architecture.current() == Architecture.AARCH64 ? 'arm64' : 'am
 dependencies {
   aarch64DockerSource project(":distribution:archives:linux-aarch64-tar")
   aarch64DockerSourceTar project(path: ":distribution:archives:linux-aarch64-tar", configuration: "default")
-  dockerSource project(":distribution:archives:linux-tar")
-  dockerSourceTar project(path: ":distribution:archives:linux-tar", configuration: "default")
+  dockerSource project(":distribution:archives:linux-amd64-tar")
+  dockerSourceTar project(path: ":distribution:archives:linux-amd64-tar", configuration: "default")
   log4jConfig project(path: ":distribution", configuration: 'log4jConfig')
   tini "krallin:tini:0.19.0:${tiniArch}"
   allPlugins project(path: ':plugins', configuration: 'allPlugins')