Update DistributionDownloader to support fetching arm64 bundles. (#929)

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Jul 2, 2021 · 25bbdb7 · 25bbdb7
1 parent f652e95
commit 25bbdb7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java
@@ -234,7 +234,16 @@ private String dependencyNotation(OpenSearchDistribution distribution) {
             extension = distribution.getPlatform() == Platform.WINDOWS ? "zip" : "tar.gz";
 
             if (distroVersion.onOrAfter("1.0.0")) {
-                classifier = ":" + distribution.getPlatform() + "-x64";
+                switch (distribution.getArchitecture()) {
+                    case ARM64:
+                        classifier = ":" + distribution.getPlatform() + "-arm64";
+                        break;
+                    case X64:
+                        classifier = ":" + distribution.getPlatform() + "-x64";
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unsupported architecture: " + distribution.getArchitecture());
+                }
             } else if (distroVersion.onOrAfter("7.0.0")) {
                 classifier = ":" + distribution.getPlatform() + "-x86_64";
             } else {

diff --git a/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java b/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java
@@ -142,15 +142,25 @@ public void testLocalCurrentVersionIntegTestZip() {
     public void testLocalCurrentVersionArchives() {
         for (Platform platform : Platform.values()) {
             for (boolean bundledJdk : new boolean[] { true, false }) {
-                // create a new project in each iteration, so that we know we are resolving the only additional project being created
-                Project project = createProject(BWC_MINOR, true);
-                String projectName = projectName(platform.toString(), bundledJdk);
-                projectName += (platform == Platform.WINDOWS ? "-zip" : "-tar");
-                Project archiveProject = ProjectBuilder.builder().withParent(archivesProject).withName(projectName).build();
-                archiveProject.getConfigurations().create("default");
-                archiveProject.getArtifacts().add("default", new File("doesnotmatter"));
-                createDistro(project, "distro", VersionProperties.getOpenSearch(), Type.ARCHIVE, platform, bundledJdk);
-                checkPlugin(project);
+                for (Architecture architecture : Architecture.values()) {
+                    // create a new project in each iteration, so that we know we are resolving the only additional project being created
+                    Project project = createProject(BWC_MINOR, true);
+                    String projectName = projectName(platform.toString(), bundledJdk);
+                    projectName += (platform == Platform.WINDOWS ? "-zip" : "-tar");
+                    Project archiveProject = ProjectBuilder.builder().withParent(archivesProject).withName(projectName).build();
+                    archiveProject.getConfigurations().create("default");
+                    archiveProject.getArtifacts().add("default", new File("doesnotmatter"));
+                    final OpenSearchDistribution distro = createDistro(
+                        project,
+                        "distro",
+                        VersionProperties.getOpenSearch(),
+                        Type.ARCHIVE,
+                        platform,
+                        bundledJdk
+                    );
+                    distro.setArchitecture(architecture);
+                    checkPlugin(project);
+                }
             }
         }
     }