diff --git a/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy index a27377c84fc..fa36bd36ed0 100644 --- a/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy @@ -70,7 +70,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT where: buildTaskName | expectedOutputArchivePath - "buildDarwinTar" | "darwin-tar/build/distributions/opensearch.tar.gz" + "buildDarwinTar" | "darwin-tar/build/distributions/opensearch-min.tar.gz" } def "applies defaults to zip tasks"() { @@ -91,7 +91,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT where: buildTaskName | expectedOutputArchivePath - "buildDarwinZip" | "darwin-zip/build/distributions/opensearch.zip" + "buildDarwinZip" | "darwin-zip/build/distributions/opensearch-min.zip" } def "registered distribution provides archives and directory variant"() { @@ -148,8 +148,8 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT then: "tar task executed and target folder contains plain tar" result.task(':buildProducerTar').outcome == TaskOutcome.SUCCESS result.task(':consumer:copyArchive').outcome == TaskOutcome.SUCCESS - file("producer-tar/build/distributions/opensearch.tar.gz").exists() - file("consumer/build/archives/opensearch.tar.gz").exists() + file("producer-tar/build/distributions/opensearch-min.tar.gz").exists() + file("consumer/build/archives/opensearch-min.tar.gz").exists() when: result = gradleRunner("copyDir", "-Pversion=1.0").build() diff --git a/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java index d5905b7da26..6153d5f6fe4 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java @@ -121,7 +121,7 @@ public class InternalDistributionArchiveSetupPlugin implements Plugin { project.getTasks().withType(AbstractArchiveTask.class).configureEach(t -> { String subdir = archiveTaskToSubprojectName(t.getName()); t.getDestinationDirectory().set(project.file(subdir + "/build/distributions")); - t.getArchiveBaseName().set("opensearch"); + t.getArchiveBaseName().set("opensearch-min"); }); } diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle index bce24b8f59b..72d44a17b4e 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -50,7 +50,7 @@ ext.expansions = { Architecture architecture, DockerBase base, boolean local -> classifier = "linux-\$(arch)" } - final String opensearch = "opensearch-${VersionProperties.getOpenSearch()}-${classifier}.tar.gz" + final String opensearch = "opensearch-min-${VersionProperties.getOpenSearch()}-${classifier}.tar.gz" /* Both the following Dockerfile commands put the resulting artifact at * the same location, regardless of classifier, so that the commands that diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 5b6b41db3ce..921439f7502 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -136,9 +136,9 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) { // SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself // Deb convention uses a '_' for final separator before architecture, rpm uses a '.' if (type == 'deb') { - conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}_${project.version}${jdkString}_${archString}.${type}")) } + conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-min_${project.version}${jdkString}_${archString}.${type}")) } } else { - conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}.${archString}.${type}")) } + conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-min-${project.version}${jdkString}.${archString}.${type}")) } } String packagingFiles = "build/packaging/${jdk ? '' : 'no-jdk-'}${type}"