Fix bwc resolution with changed architecture

Author: breskeby

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

@@ -14,18 +14,28 @@
  * */
 public enum Architecture {
 
-    AMD64("amd64", "x64", "X86_64", "x86_64", "amd64", "linux/amd64"),
-    AARCH64("aarch64", "aarch64", "aarch64", "aarch64", "arm64", "linux/arm64");
+    AMD64("amd64", "x86_64", "x64", "X86_64", "x86_64", "amd64", "linux/amd64"),
+    AARCH64("aarch64", "aarch64", "aarch64", "aarch64", "aarch64", "arm64", "linux/arm64");
 
     public final String classifier;
     public final String dockerPlatform;
+    public final String bwcClassifier;
     public final String jdkClassifier;
     public final String mlClassifier;
     public final String debianClassifier;
     public final String rpmClassifier;
 
-    Architecture(String classifier, String jdkClassifier, String rpmClassifier, String mlClassifier, String debianClassifier, String dockerPlatform) {
+    Architecture(
+        String classifier,
+        String bwcClassifier,
+        String jdkClassifier,
+        String rpmClassifier,
+        String mlClassifier,
+        String debianClassifier,
+        String dockerPlatform
+    ) {
         this.classifier = classifier;
+        this.bwcClassifier = bwcClassifier;
         this.jdkClassifier = jdkClassifier;
         this.rpmClassifier = rpmClassifier;
         this.mlClassifier = mlClassifier;

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

@@ -26,6 +26,7 @@ default String getExtension(ElasticsearchDistribution.Platform platform) {
     }
 
     default String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
-        return ":" + Architecture.current().classifier;
+        Architecture arch = Architecture.current();
+        return version.onOrAfter("9.2.0") ? ":" + arch.classifier : ":" + arch.bwcClassifier;
     }
 }