Remove OSS specific distribution packaging (#69775)

* Remove OSS projects from distribution packaging
* Remove OSS flavor from ElasticsearchDistribution
* Remove OSS handling from docker build setup

buildSrc/build.gradle

@@ -169,16 +169,10 @@ if (project != rootProject) {
   dependencies {
     reaper project('reaper')
     distribution project(':distribution:archives:windows-zip')
-    distribution project(':distribution:archives:oss-windows-zip')
     distribution project(':distribution:archives:darwin-tar')
     distribution project(':distribution:archives:darwin-aarch64-tar')
-    distribution project(':distribution:archives:oss-darwin-tar')
-    distribution project(':distribution:archives:oss-darwin-aarch64-tar')
     distribution project(':distribution:archives:linux-aarch64-tar')
     distribution project(':distribution:archives:linux-tar')
-    distribution project(':distribution:archives:oss-linux-tar')
-    distribution project(':distribution:archives:oss-linux-aarch64-tar')
-
     integTestRuntimeOnly(project(":libs:elasticsearch-core"))
   }
 

buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle;
 
-import org.elasticsearch.gradle.ElasticsearchDistribution.Flavor;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
 import org.elasticsearch.gradle.docker.DockerSupportPlugin;
@@ -177,12 +176,7 @@ public class DistributionDownloadPlugin implements Plugin<Project> {
         } else if (distribution.getType() == Type.DEB) {
             classifier = ":amd64";
         }
-        String flavor = "";
-        if (distribution.getFlavor() == Flavor.OSS && distroVersion.onOrAfter("6.3.0")) {
-            flavor = "-oss";
-        }
-
         String group = distribution.getVersion().endsWith("-SNAPSHOT") ? FAKE_SNAPSHOT_IVY_GROUP : FAKE_IVY_GROUP;
-        return group + ":elasticsearch" + flavor + ":" + distribution.getVersion() + classifier + "@" + extension;
+        return group + ":elasticsearch" + ":" + distribution.getVersion() + classifier + "@" + extension;
     }
 }

buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java

@@ -63,16 +63,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
         }
     }
 
-    public enum Flavor {
-        DEFAULT,
-        OSS;
-
-        @Override
-        public String toString() {
-            return super.toString().toLowerCase(Locale.ROOT);
-        }
-    }
-
     // package private to tests can use
     public static final Platform CURRENT_PLATFORM = OS.<Platform>conditional()
         .onLinux(() -> Platform.LINUX)
@@ -89,7 +79,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
     private final Property<String> version;
     private final Property<Type> type;
     private final Property<Platform> platform;
-    private final Property<Flavor> flavor;
     private final Property<Boolean> bundledJdk;
     private final Property<Boolean> failIfUnavailable;
     private final Configuration extracted;
@@ -112,7 +101,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
         this.type = objectFactory.property(Type.class);
         this.type.convention(Type.ARCHIVE);
         this.platform = objectFactory.property(Platform.class);
-        this.flavor = objectFactory.property(Flavor.class);
         this.bundledJdk = objectFactory.property(Boolean.class);
         this.failIfUnavailable = objectFactory.property(Boolean.class).convention(true);
         this.extracted = extractedConfiguration;
@@ -148,14 +136,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
         this.type.set(type);
     }
 
-    public Flavor getFlavor() {
-        return flavor.getOrNull();
-    }
-
-    public void setFlavor(Flavor flavor) {
-        this.flavor.set(flavor);
-    }
-
     public boolean getBundledJdk() {
         return bundledJdk.getOrElse(true);
     }
@@ -252,11 +232,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
                     "platform cannot be set on elasticsearch distribution [" + name + "] of type [integ_test_zip]"
                 );
             }
-            if (flavor.getOrNull() != null) {
-                throw new IllegalArgumentException(
-                    "flavor [" + flavor.get() + "] not allowed for elasticsearch distribution [" + name + "] of type [integ_test_zip]"
-                );
-            }
             if (bundledJdk.getOrNull() != null) {
                 throw new IllegalArgumentException(
                     "bundledJdk cannot be set on elasticsearch distribution [" + name + "] of type [integ_test_zip]"
@@ -288,15 +263,9 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
                         "bundledJdk cannot be set on elasticsearch distribution [" + name + "] of type " + "[docker]"
                     );
                 }
-                if (flavor.get() == Flavor.OSS && type.get() == Type.DOCKER_UBI) {
-                    throw new IllegalArgumentException("Cannot build a UBI docker image for the OSS distribution");
-                }
             }
         }
 
-        if (flavor.isPresent() == false) {
-            flavor.set(Flavor.DEFAULT);
-        }
         if (bundledJdk.isPresent() == false) {
             bundledJdk.set(true);
         }
@@ -304,7 +273,6 @@ public class ElasticsearchDistribution implements Buildable, Iterable<File> {
         version.finalizeValue();
         platform.finalizeValue();
         type.finalizeValue();
-        flavor.finalizeValue();
         bundledJdk.finalizeValue();
     }
 

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

@@ -147,10 +147,6 @@ public class InternalDistributionDownloadPlugin implements InternalPlugin {
             ? ""
             : "-" + architecture.toString().toLowerCase();
 
-        if (distribution.getFlavor() == ElasticsearchDistribution.Flavor.OSS) {
-            projectName += "oss-";
-        }
-
         if (distribution.getBundledJdk() == false) {
             projectName += "no-jdk-";
         }

buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java

@@ -11,7 +11,6 @@ package org.elasticsearch.gradle.test;
 import org.elasticsearch.gradle.Architecture;
 import org.elasticsearch.gradle.DistributionDownloadPlugin;
 import org.elasticsearch.gradle.ElasticsearchDistribution;
-import org.elasticsearch.gradle.ElasticsearchDistribution.Flavor;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
 import org.elasticsearch.gradle.Jdk;
@@ -98,7 +97,6 @@ public class DistroTestPlugin implements Plugin<Project> {
         Map<Type, List<TaskProvider<Test>>> linuxTestTasks = new HashMap<>();
         Map<String, List<TaskProvider<Test>>> upgradeTestTasks = new HashMap<>();
         Map<String, TaskProvider<?>> depsTasks = new HashMap<>();
-
         for (ElasticsearchDistribution distribution : testDistributions) {
             String taskname = destructiveDistroTestTaskName(distribution);
             TaskProvider<?> depsTask = project.getTasks().register(taskname + "#deps");
@@ -123,9 +121,6 @@ public class DistroTestPlugin implements Plugin<Project> {
 
             if ((distribution.getType() == Type.DEB || distribution.getType() == Type.RPM) && distribution.getBundledJdk()) {
                 for (Version version : BuildParams.getBwcVersions().getIndexCompatible()) {
-                    if (distribution.getFlavor() == Flavor.OSS && version.before("6.3.0")) {
-                        continue; // before opening xpack
-                    }
                     final ElasticsearchDistribution bwcDistro;
                     if (version.equals(Version.fromString(distribution.getVersion()))) {
                         // this is the same as the distribution we are testing
@@ -136,7 +131,6 @@ public class DistroTestPlugin implements Plugin<Project> {
                             distribution.getArchitecture(),
                             distribution.getType(),
                             distribution.getPlatform(),
-                            distribution.getFlavor(),
                             distribution.getBundledJdk(),
                             version.toString()
                         );
@@ -228,7 +222,6 @@ public class DistroTestPlugin implements Plugin<Project> {
 
     private static Map<ElasticsearchDistribution.Type, TaskProvider<?>> lifecycleTasks(Project project, String taskPrefix) {
         Map<ElasticsearchDistribution.Type, TaskProvider<?>> lifecyleTasks = new HashMap<>();
-
         lifecyleTasks.put(Type.DOCKER, project.getTasks().register(taskPrefix + ".docker"));
         lifecyleTasks.put(Type.DOCKER_UBI, project.getTasks().register(taskPrefix + ".ubi"));
         lifecyleTasks.put(Type.ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
@@ -369,54 +362,36 @@ public class DistroTestPlugin implements Plugin<Project> {
 
         for (Architecture architecture : Architecture.values()) {
             for (Type type : List.of(Type.DEB, Type.RPM, Type.DOCKER, Type.DOCKER_UBI)) {
-                for (Flavor flavor : Flavor.values()) {
-                    for (boolean bundledJdk : Arrays.asList(true, false)) {
-                        if (bundledJdk == false) {
-                            // We'll never publish an ARM (aarch64) build without a bundled JDK.
-                            if (architecture == Architecture.AARCH64) {
-                                continue;
-                            }
-                            // All our Docker images include a bundled JDK so it doesn't make sense to test without one.
-                            if (type == Type.DOCKER || type == Type.DOCKER_UBI) {
-                                continue;
-                            }
+                for (boolean bundledJdk : Arrays.asList(true, false)) {
+                    if (bundledJdk == false) {
+                        // We'll never publish an ARM (aarch64) build without a bundled JDK.
+                        if (architecture == Architecture.AARCH64) {
+                            continue;
                         }
-
-                        // We don't publish the OSS distribution on UBI
-                        if (type == Type.DOCKER_UBI && flavor == Flavor.OSS) {
+                        // All our Docker images include a bundled JDK so it doesn't make sense to test without one.
+                        if (type == Type.DOCKER || type == Type.DOCKER_UBI) {
                             continue;
                         }
-
-                        currentDistros.add(
-                            createDistro(distributions, architecture, type, null, flavor, bundledJdk, VersionProperties.getElasticsearch())
-                        );
                     }
+                    currentDistros.add(
+                        createDistro(distributions, architecture, type, null, bundledJdk, VersionProperties.getElasticsearch())
+                    );
                 }
             }
         }
 
         for (Architecture architecture : Architecture.values()) {
             for (Platform platform : Arrays.asList(Platform.LINUX, Platform.WINDOWS)) {
-                for (Flavor flavor : Flavor.values()) {
-                    for (boolean bundledJdk : Arrays.asList(true, false)) {
-                        if (bundledJdk == false && architecture != Architecture.X64) {
-                            // We will never publish distributions for non-x86 (amd64) platforms
-                            // without a bundled JDK
-                            continue;
-                        }
-
-                        currentDistros.add(
-                            createDistro(
-                                distributions,
-                                architecture,
-                                Type.ARCHIVE,
-                                platform,
-                                flavor,
-                                bundledJdk,
-                                VersionProperties.getElasticsearch()
-                            )
-                        );
+                for (boolean bundledJdk : Arrays.asList(true, false)) {
+                    if (bundledJdk == false && architecture != Architecture.X64) {
+                        // We will never publish distributions for non-x86 (amd64) platforms
+                        // without a bundled JDK
+                        continue;
                     }
+
+                    currentDistros.add(
+                        createDistro(distributions, architecture, Type.ARCHIVE, platform, bundledJdk, VersionProperties.getElasticsearch())
+                    );
                 }
             }
         }
@@ -429,15 +404,13 @@ public class DistroTestPlugin implements Plugin<Project> {
         Architecture architecture,
         Type type,
         Platform platform,
-        Flavor flavor,
         boolean bundledJdk,
         String version
     ) {
-        String name = distroId(type, platform, flavor, bundledJdk, architecture) + "-" + version;
+        String name = distroId(type, platform, bundledJdk, architecture) + "-" + version;
         boolean isDocker = type == Type.DOCKER || type == Type.DOCKER_UBI;
         ElasticsearchDistribution distro = distributions.create(name, d -> {
             d.setArchitecture(architecture);
-            d.setFlavor(flavor);
             d.setType(type);
             if (type == Type.ARCHIVE) {
                 d.setPlatform(platform);
@@ -462,9 +435,8 @@ public class DistroTestPlugin implements Plugin<Project> {
         return project.getName().contains("windows");
     }
 
-    private static String distroId(Type type, Platform platform, Flavor flavor, boolean bundledJdk, Architecture architecture) {
-        return flavor
-            + "-"
+    private static String distroId(Type type, Platform platform, boolean bundledJdk, Architecture architecture) {
+        return "default-"
             + (type == Type.ARCHIVE ? platform + "-" : "")
             + type
             + (bundledJdk ? "" : "-no-jdk")
@@ -473,8 +445,7 @@ public class DistroTestPlugin implements Plugin<Project> {
 
     private static String destructiveDistroTestTaskName(ElasticsearchDistribution distro) {
         Type type = distro.getType();
-        return "destructiveDistroTest."
-            + distroId(type, distro.getPlatform(), distro.getFlavor(), distro.getBundledJdk(), distro.getArchitecture());
+        return "destructiveDistroTest." + distroId(type, distro.getPlatform(), distro.getBundledJdk(), distro.getArchitecture());
     }
 
     private static String destructiveDistroUpgradeTestTaskName(ElasticsearchDistribution distro, String bwcVersion) {
@@ -482,7 +453,7 @@ public class DistroTestPlugin implements Plugin<Project> {
         return "destructiveDistroUpgradeTest.v"
             + bwcVersion
             + "."
-            + distroId(type, distro.getPlatform(), distro.getFlavor(), distro.getBundledJdk(), distro.getArchitecture());
+            + distroId(type, distro.getPlatform(), distro.getBundledJdk(), distro.getArchitecture());
     }
 
     private static void addDistributionSysprop(Test task, String sysprop, Supplier<String> valueSupplier) {

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

@@ -261,16 +261,10 @@ public class ElasticsearchNode implements TestClusterConfiguration {
         if (testDistribution == TestDistribution.INTEG_TEST) {
             distribution.setType(ElasticsearchDistribution.Type.INTEG_TEST_ZIP);
             // we change the underlying distribution when changing the test distribution of the cluster.
-            distribution.setFlavor(null);
             distribution.setPlatform(null);
             distribution.setBundledJdk(null);
         } else {
             distribution.setType(ElasticsearchDistribution.Type.ARCHIVE);
-            if (testDistribution == TestDistribution.DEFAULT) {
-                distribution.setFlavor(ElasticsearchDistribution.Flavor.DEFAULT);
-            } else {
-                distribution.setFlavor(ElasticsearchDistribution.Flavor.OSS);
-            }
         }
     }
 

buildSrc/src/test/java/org/elasticsearch/gradle/DistributionDownloadPluginTests.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle;
 
-import org.elasticsearch.gradle.ElasticsearchDistribution.Flavor;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
 import org.elasticsearch.gradle.info.BuildParams;
@@ -52,15 +51,7 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
     );
 
     public void testVersionDefault() {
-        ElasticsearchDistribution distro = checkDistro(
-            createProject(null, false),
-            "testdistro",
-            null,
-            Type.ARCHIVE,
-            Platform.LINUX,
-            Flavor.OSS,
-            true
-        );
+        ElasticsearchDistribution distro = checkDistro(createProject(null, false), "testdistro", null, Type.ARCHIVE, Platform.LINUX, true);
         assertEquals(distro.getVersion(), VersionProperties.getElasticsearch());
     }
 
@@ -71,35 +62,18 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
             "badversion",
             Type.ARCHIVE,
             Platform.LINUX,
-            Flavor.OSS,
             true,
             "Invalid version format: 'badversion'"
         );
     }
 
     public void testTypeDefault() {
-        ElasticsearchDistribution distro = checkDistro(
-            createProject(null, false),
-            "testdistro",
-            "5.0.0",
-            null,
-            Platform.LINUX,
-            Flavor.OSS,
-            true
-        );
+        ElasticsearchDistribution distro = checkDistro(createProject(null, false), "testdistro", "5.0.0", null, Platform.LINUX, true);
         assertEquals(distro.getType(), Type.ARCHIVE);
     }
 
     public void testPlatformDefault() {
-        ElasticsearchDistribution distro = checkDistro(
-            createProject(null, false),
-            "testdistro",
-            "5.0.0",
-            Type.ARCHIVE,
-            null,
-            Flavor.OSS,
-            true
-        );
+        ElasticsearchDistribution distro = checkDistro(createProject(null, false), "testdistro", "5.0.0", Type.ARCHIVE, null, true);
         assertEquals(distro.getPlatform(), ElasticsearchDistribution.CURRENT_PLATFORM);
     }
 
@@ -111,37 +85,10 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
             Type.INTEG_TEST_ZIP,
             Platform.LINUX,
             null,
-            null,
             "platform cannot be set on elasticsearch distribution [testdistro]"
         );
     }
 
-    public void testFlavorDefault() {
-        ElasticsearchDistribution distro = checkDistro(
-            createProject(null, false),
-            "testdistro",
-            "5.0.0",
-            Type.ARCHIVE,
-            Platform.LINUX,
-            null,
-            true
-        );
-        assertEquals(distro.getFlavor(), Flavor.DEFAULT);
-    }
-
-    public void testFlavorForIntegTest() {
-        assertDistroError(
-            createProject(null, false),
-            "testdistro",
-            "5.0.0",
-            Type.INTEG_TEST_ZIP,
-            null,
-            Flavor.OSS,
-            null,
-            "flavor [oss] not allowed for elasticsearch distribution [testdistro] of type [integ_test_zip]"
-        );
-    }
-
     public void testBundledJdkDefault() {
         ElasticsearchDistribution distro = checkDistro(
             createProject(null, false),
@@ -149,7 +96,6 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
             "5.0.0",
             Type.ARCHIVE,
             Platform.LINUX,
-            null,
             true
         );
         assertTrue(distro.getBundledJdk());
@@ -162,7 +108,6 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
             "5.0.0",
             Type.INTEG_TEST_ZIP,
             null,
-            null,
             true,
             "bundledJdk cannot be set on elasticsearch distribution [testdistro]"
         );
@@ -173,67 +118,58 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         Project archiveProject = ProjectBuilder.builder().withParent(archivesProject).withName("integ-test-zip").build();
         archiveProject.getConfigurations().create("default");
         archiveProject.getArtifacts().add("default", new File("doesnotmatter"));
-        createDistro(project, "distro", VersionProperties.getElasticsearch(), Type.INTEG_TEST_ZIP, null, null, null);
+        createDistro(project, "distro", VersionProperties.getElasticsearch(), Type.INTEG_TEST_ZIP, null, null);
     }
 
     public void testLocalCurrentVersionArchives() {
         for (Platform platform : Platform.values()) {
-            for (Flavor flavor : Flavor.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(), flavor, 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.getElasticsearch(), Type.ARCHIVE, platform, flavor, bundledJdk);
-                }
+            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.getElasticsearch(), Type.ARCHIVE, platform, bundledJdk);
             }
         }
     }
 
     public void testLocalCurrentVersionPackages() {
         for (Type packageType : new Type[] { Type.RPM, Type.DEB }) {
-            for (Flavor flavor : Flavor.values()) {
-                for (boolean bundledJdk : new boolean[] { true, false }) {
-                    Project project = createProject(BWC_MINOR, true);
-                    String projectName = projectName(packageType.toString(), flavor, bundledJdk);
-                    Project packageProject = ProjectBuilder.builder().withParent(packagesProject).withName(projectName).build();
-                    packageProject.getConfigurations().create("default");
-                    packageProject.getArtifacts().add("default", new File("doesnotmatter"));
-                    createDistro(project, "distro", VersionProperties.getElasticsearch(), packageType, null, flavor, bundledJdk);
-                }
+            for (boolean bundledJdk : new boolean[] { true, false }) {
+                Project project = createProject(BWC_MINOR, true);
+                String projectName = projectName(packageType.toString(), bundledJdk);
+                Project packageProject = ProjectBuilder.builder().withParent(packagesProject).withName(projectName).build();
+                packageProject.getConfigurations().create("default");
+                packageProject.getArtifacts().add("default", new File("doesnotmatter"));
+                createDistro(project, "distro", VersionProperties.getElasticsearch(), packageType, null, bundledJdk);
             }
         }
     }
 
     public void testLocalBwcArchives() {
         for (Platform platform : Platform.values()) {
-            for (Flavor flavor : Flavor.values()) {
-                // note: no non bundled jdk for bwc
-                String configName = projectName(platform.toString(), flavor, true);
-                configName += (platform == Platform.WINDOWS ? "-zip" : "-tar");
+            // note: no non bundled jdk for bwc
+            String configName = projectName(platform.toString(), true);
+            configName += (platform == Platform.WINDOWS ? "-zip" : "-tar");
 
-                checkBwc("minor", configName, BWC_MINOR_VERSION, Type.ARCHIVE, platform, flavor, BWC_MINOR, true);
-                checkBwc("staged", configName, BWC_STAGED_VERSION, Type.ARCHIVE, platform, flavor, BWC_STAGED, true);
-                checkBwc("bugfix", configName, BWC_BUGFIX_VERSION, Type.ARCHIVE, platform, flavor, BWC_BUGFIX, true);
-                checkBwc("maintenance", configName, BWC_MAINTENANCE_VERSION, Type.ARCHIVE, platform, flavor, BWC_MAINTENANCE, true);
-            }
+            checkBwc("minor", configName, BWC_MINOR_VERSION, Type.ARCHIVE, platform, BWC_MINOR, true);
+            checkBwc("staged", configName, BWC_STAGED_VERSION, Type.ARCHIVE, platform, BWC_STAGED, true);
+            checkBwc("bugfix", configName, BWC_BUGFIX_VERSION, Type.ARCHIVE, platform, BWC_BUGFIX, true);
+            checkBwc("maintenance", configName, BWC_MAINTENANCE_VERSION, Type.ARCHIVE, platform, BWC_MAINTENANCE, true);
         }
     }
 
     public void testLocalBwcPackages() {
         for (Type packageType : new Type[] { Type.RPM, Type.DEB }) {
-            for (Flavor flavor : Flavor.values()) {
-                // note: no non bundled jdk for bwc
-                String configName = projectName(packageType.toString(), flavor, true);
-
-                checkBwc("minor", configName, BWC_MINOR_VERSION, packageType, null, flavor, BWC_MINOR, true);
-                checkBwc("staged", configName, BWC_STAGED_VERSION, packageType, null, flavor, BWC_STAGED, true);
-                checkBwc("bugfix", configName, BWC_BUGFIX_VERSION, packageType, null, flavor, BWC_BUGFIX, true);
-                checkBwc("maintenance", configName, BWC_MAINTENANCE_VERSION, packageType, null, flavor, BWC_MAINTENANCE, true);
-            }
+            // note: no non bundled jdk for bwc
+            String configName = projectName(packageType.toString(), true);
+            checkBwc("minor", configName, BWC_MINOR_VERSION, packageType, null, BWC_MINOR, true);
+            checkBwc("staged", configName, BWC_STAGED_VERSION, packageType, null, BWC_STAGED, true);
+            checkBwc("bugfix", configName, BWC_BUGFIX_VERSION, packageType, null, BWC_BUGFIX, true);
+            checkBwc("maintenance", configName, BWC_MAINTENANCE_VERSION, packageType, null, BWC_MAINTENANCE, true);
         }
     }
 
@@ -243,13 +179,12 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         String version,
         Type type,
         Platform platform,
-        Flavor flavor,
         Boolean bundledJdk,
         String message
     ) {
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
-            () -> checkDistro(project, name, version, type, platform, flavor, bundledJdk)
+            () -> checkDistro(project, name, version, type, platform, bundledJdk)
         );
         assertThat(e.getMessage(), containsString(message));
     }
@@ -260,7 +195,6 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         String version,
         Type type,
         Platform platform,
-        Flavor flavor,
         Boolean bundledJdk
     ) {
         NamedDomainObjectContainer<ElasticsearchDistribution> distros = DistributionDownloadPlugin.getContainer(project);
@@ -274,9 +208,6 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
             if (platform != null) {
                 distro.setPlatform(platform);
             }
-            if (flavor != null) {
-                distro.setFlavor(flavor);
-            }
             if (bundledJdk != null) {
                 distro.setBundledJdk(bundledJdk);
             }
@@ -290,10 +221,9 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         String version,
         Type type,
         Platform platform,
-        Flavor flavor,
         Boolean bundledJdk
     ) {
-        ElasticsearchDistribution distribution = createDistro(project, name, version, type, platform, flavor, bundledJdk);
+        ElasticsearchDistribution distribution = createDistro(project, name, version, type, platform, bundledJdk);
         distribution.finalizeValues();
         return distribution;
     }
@@ -304,7 +234,6 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         Version version,
         Type type,
         Platform platform,
-        Flavor flavor,
         BwcVersions bwcVersions,
         boolean isInternal
     ) {
@@ -312,7 +241,7 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         Project archiveProject = ProjectBuilder.builder().withParent(bwcProject).withName(projectName).build();
         archiveProject.getConfigurations().create(config);
         archiveProject.getArtifacts().add(config, new File("doesnotmatter"));
-        createDistro(project, "distro", version.toString(), type, platform, flavor, true);
+        createDistro(project, "distro", version.toString(), type, platform, true);
     }
 
     private Project createProject(BwcVersions bwcVersions, boolean isInternal) {
@@ -330,15 +259,8 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
         return project;
     }
 
-    private static String projectName(String base, Flavor flavor, boolean bundledJdk) {
-        String prefix = "";
-        if (flavor == Flavor.OSS) {
-            prefix += "oss-";
-        }
-        if (bundledJdk == false) {
-            prefix += "no-jdk-";
-        }
-
+    private static String projectName(String base, boolean bundledJdk) {
+        String prefix = bundledJdk == false ? "no-jdk-" : "";
         return prefix + base;
     }
 }

distribution/archives/build.gradle

@@ -72,126 +72,63 @@ distribution_archives {
   windowsZip {
     archiveClassifier = 'windows-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'windows-x86_64'), 'zip', 'windows', 'x64', false, true)
-    }
-  }
-
-  ossWindowsZip {
-    archiveClassifier = 'windows-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'windows-x86_64'), 'zip', 'windows', 'x64', true, true)
+      archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false, true)
     }
   }
 
   noJdkWindowsZip {
     archiveClassifier = 'no-jdk-windows-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'windows-x86_64'), 'zip', 'windows', 'x64', false, false)
-    }
-  }
-
-  ossNoJdkWindowsZip {
-    archiveClassifier = 'no-jdk-windows-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'windows-x86_64'), 'zip', 'windows', 'x64', true, false)
+      archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false, false)
     }
   }
 
   darwinTar {
     archiveClassifier = 'darwin-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'darwin-x86_64'), 'tar', 'darwin', 'x64', false, true)
+      archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false, true)
     }
   }
 
   darwinAarch64Tar {
     archiveClassifier = 'darwin-aarch64'
     content {
-      archiveFiles(modulesFiles(false, 'darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, true)
-    }
-  }
-
-  ossDarwinTar {
-    archiveClassifier = 'darwin-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'darwin-x86_64'), 'tar', 'darwin', 'x64', true, true)
-    }
-  }
-
-  ossDarwinAarch64Tar {
-    archiveClassifier = 'darwin-aarch64'
-    content {
-      archiveFiles(modulesFiles(true, 'darwin-aarch64'), 'tar', 'darwin', 'aarch64', true, true)
+      archiveFiles(modulesFiles('darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, true)
     }
   }
 
   noJdkDarwinTar {
     archiveClassifier = 'no-jdk-darwin-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'darwin-x86_64'), 'tar', 'darwin', 'x64', false, false)
-    }
-  }
-
-  ossNoJdkDarwinTar {
-    archiveClassifier = 'no-jdk-darwin-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'darwin-x86_64'), 'tar', 'darwin', 'x64', true, false)
+      archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false, false)
     }
   }
 
   noJdkDarwinAarch64Tar {
     archiveClassifier = 'no-jdk-darwin-aarch64'
     content {
-      archiveFiles(modulesFiles(false, 'darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, false)
-    }
-  }
-
-  ossNoJdkDarwinAarch64Tar {
-    archiveClassifier = 'no-jdk-darwin-aarch64'
-    content {
-      archiveFiles(modulesFiles(true, 'darwin-aarch64'), 'tar', 'darwin', 'aarch64', true, false)
+      archiveFiles(modulesFiles('darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, false)
     }
   }
 
   linuxAarch64Tar {
     archiveClassifier = 'linux-aarch64'
     content {
-      archiveFiles(modulesFiles(false, 'linux-aarch64'), 'tar', 'linux', 'aarch64', false, true)
+      archiveFiles(modulesFiles('linux-aarch64'), 'tar', 'linux', 'aarch64', false, true)
     }
   }
 
   linuxTar {
     archiveClassifier = 'linux-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'linux-x86_64'), 'tar', 'linux', 'x64', false, true)
-    }
-  }
-
-  ossLinuxAarch64Tar {
-    archiveClassifier = 'linux-aarch64'
-    content {
-      archiveFiles(modulesFiles(true, 'linux-aarch64'), 'tar', 'linux', 'aarch64', true, true)
-    }
-  }
-
-  ossLinuxTar {
-    archiveClassifier = 'linux-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'linux-x86_64'), 'tar', 'linux', 'x64', true, true)
+      archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false, true)
     }
   }
 
   noJdkLinuxTar {
     archiveClassifier = 'no-jdk-linux-x86_64'
     content {
-      archiveFiles(modulesFiles(false, 'linux-x86_64'), 'tar', 'linux', 'x64', false, false)
-    }
-  }
-
-  ossNoJdkLinuxTar {
-    archiveClassifier = 'no-jdk-linux-x86_64'
-    content {
-      archiveFiles(modulesFiles(true, 'linux-x86_64'), 'tar', 'linux', 'x64', true, false)
+      archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false, false)
     }
   }
 }
@@ -200,5 +137,5 @@ subprojects {
   apply plugin: 'distribution'
   apply plugin: 'elasticsearch.internal-distribution-archive-check'
 
-  group = "org.elasticsearch.distribution.${name.startsWith("oss-") ? "oss" : "default"}"
+  group = "org.elasticsearch.distribution.default"
 }

distribution/archives/oss-darwin-aarch64-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-darwin-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-linux-aarch64-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-linux-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-no-jdk-darwin-aarch64-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-no-jdk-darwin-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-no-jdk-linux-tar/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-no-jdk-windows-zip/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/archives/oss-windows-zip/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/build.gradle

@@ -355,7 +355,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
       }
     }
 
-    modulesFiles = { oss, platform ->
+    modulesFiles = { platform ->
       copySpec {
         eachFile {
           if (it.relativePath.segments[-2] == 'bin' || ((platform == 'darwin-x86_64' || platform == 'darwin-aarch64') && it.relativePath.segments[-2] == 'MacOS')) {
@@ -366,24 +366,16 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
             it.mode = 0644
           }
         }
-        def buildModules
-        if (oss) {
-          buildModules = buildOssModulesTaskProvider
-        } else {
-          buildModules = buildDefaultModulesTaskProvider
-        }
         List excludePlatforms = ['linux-x86_64', 'linux-aarch64', 'windows-x86_64', 'darwin-x86_64', 'darwin-aarch64']
         if (platform != null) {
           excludePlatforms.remove(excludePlatforms.indexOf(platform))
         } else {
           excludePlatforms = []
         }
-        from(buildModules) {
+        from(buildDefaultModulesTaskProvider) {
           // geo registers the geo_shape mapper that is overridden by
           // the geo_shape mapper registered in the x-pack-spatial plugin
-          if (oss == false) {
-            exclude "**/geo/**"
-          }
+          exclude "**/geo/**"
 
           for (String excludePlatform : excludePlatforms) {
             exclude "**/platform/${excludePlatform}/**"
@@ -463,11 +455,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
         if (project.name == 'integ-test-zip') {
           from buildServerNoticeTaskProvider
         } else {
-          if (oss && jdk) {
-            from buildOssNoticeTaskProvider
-          } else if (oss) {
-            from buildOssNoJdkNoticeTaskProvider
-          } else if (jdk) {
+         if (jdk) {
             from buildDefaultNoticeTaskProvider
           } else {
             from buildDefaultNoJdkNoticeTaskProvider
@@ -656,16 +644,14 @@ subprojects {
   }
 }
 
-['archives:windows-zip', 'archives:oss-windows-zip',
- 'archives:darwin-tar', 'archives:oss-darwin-tar',
- 'archives:darwin-aarch64-tar', 'archives:oss-darwin-aarch64-tar',
- 'archives:linux-aarch64-tar', 'archives:oss-linux-aarch64-tar',
- 'archives:linux-tar', 'archives:oss-linux-tar',
+['archives:windows-zip',
+ 'archives:darwin-tar',
+ 'archives:darwin-aarch64-tar',
+ 'archives:linux-aarch64-tar',
+ 'archives:linux-tar',
  'archives:integ-test-zip',
  'packages:rpm', 'packages:deb',
  'packages:aarch64-rpm', 'packages:aarch64-deb',
- 'packages:oss-rpm', 'packages:oss-deb',
- 'packages:aarch64-oss-rpm', 'packages:aarch64-oss-deb'
 ].forEach { subName ->
   Project subproject = project("${project.path}:${subName}")
   Configuration configuration = configurations.create(subproject.name)

distribution/docker/build.gradle

@@ -1,6 +1,5 @@
 import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.DockerBase
-import org.elasticsearch.gradle.ElasticsearchDistribution.Flavor
 import org.elasticsearch.gradle.LoggedExec
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.docker.DockerBuildTask
@@ -20,20 +19,16 @@ testFixtures.useFixture()
 configurations {
   aarch64DockerSource
   dockerSource
-  aarch64OssDockerSource
-  ossDockerSource
   transformLog4jJar
 }
 
 dependencies {
   aarch64DockerSource project(path: ":distribution:archives:linux-aarch64-tar", configuration:"default")
   dockerSource project(path: ":distribution:archives:linux-tar", configuration:"default")
-  aarch64OssDockerSource project(path: ":distribution:archives:oss-linux-aarch64-tar", configuration:"default")
-  ossDockerSource project(path: ":distribution:archives:oss-linux-tar", configuration:"default")
   transformLog4jJar project(path: ":distribution:docker:transform-log4j-config", configuration: "default")
 }
 
-ext.expansions = { Architecture architecture, boolean oss, DockerBase base, boolean local ->
+ext.expansions = { Architecture architecture, DockerBase base, boolean local ->
   String classifier
   if (local) {
     if (architecture == Architecture.AARCH64) {
@@ -50,7 +45,7 @@ ext.expansions = { Architecture architecture, boolean oss, DockerBase base, bool
     classifier = "linux-\$(arch)"
   }
 
-  final String elasticsearch = "elasticsearch-${oss ? 'oss-' : ''}${VersionProperties.elasticsearch}-${classifier}.tar.gz"
+  final String elasticsearch = "elasticsearch-${VersionProperties.elasticsearch}-${classifier}.tar.gz"
 
   String buildArgs = '#'
   if (base == DockerBase.IRON_BANK) {
@@ -105,27 +100,25 @@ class SquashNewlinesFilter extends FilterReader {
   }
 }
 
-private static String buildPath(Architecture architecture, boolean oss, DockerBase base) {
+private static String buildPath(Architecture architecture, DockerBase base) {
   return 'build/' +
     (architecture == Architecture.AARCH64 ? 'aarch64-' : '') +
-    (oss ? 'oss-' : '') +
     (base == DockerBase.UBI ? 'ubi-' : '') +
     (base == DockerBase.UBI ? 'ubi-' : (base == DockerBase.IRON_BANK ? 'ironbank-' : '')) +
     'docker'
 }
 
-private static String taskName(String prefix, Architecture architecture, boolean oss, DockerBase base, String suffix) {
+private static String taskName(String prefix, Architecture architecture, DockerBase base, String suffix) {
   return prefix +
     (architecture == Architecture.AARCH64 ? 'Aarch64' : '') +
-    (oss ? 'Oss' : '') +
     (base == DockerBase.UBI ? 'Ubi' : (base == DockerBase.IRON_BANK ? 'IronBank' : '')) +
     suffix
 }
 
 project.ext {
-  dockerBuildContext = { Architecture architecture, boolean oss, DockerBase base, boolean local ->
+  dockerBuildContext = { Architecture architecture, DockerBase base, boolean local ->
     copySpec {
-      final Map<String,String> varExpansions = expansions(architecture, oss, base, local)
+      final Map<String,String> varExpansions = expansions(architecture, base, local)
       final Path projectDir = project.projectDir.toPath()
 
       if (base == DockerBase.IRON_BANK) {
@@ -149,9 +142,6 @@ project.ext {
           // build-context sub-modules.
           duplicatesStrategy = DuplicatesStrategy.INCLUDE
           from projectDir.resolve("src/docker/config")
-          if (oss) {
-            from projectDir.resolve("src/docker/config/oss")
-          }
         }
       }
 
@@ -163,35 +153,23 @@ project.ext {
   }
 }
 
-void addCopyDockerContextTask(Architecture architecture, boolean oss, DockerBase base) {
-  if (oss && base != DockerBase.CENTOS) {
-    throw new GradleException("The only allowed docker base image for OSS builds is CENTOS")
-  }
-
-  tasks.register(taskName("copy", architecture, oss, base, "DockerContext"), Sync) {
-    expansions(architecture, oss, base, true).findAll { it.key != 'build_date' }.each { k, v ->
+void addCopyDockerContextTask(Architecture architecture, DockerBase base) {
+  tasks.register(taskName("copy", architecture, base, "DockerContext"), Sync) {
+    expansions(architecture, base, true).findAll { it.key != 'build_date' }.each { k, v ->
       inputs.property(k, { v.toString() })
     }
-    into buildPath(architecture, oss, base)
+    into buildPath(architecture, base)
 
-    with dockerBuildContext(architecture, oss, base, true)
+    with dockerBuildContext(architecture, base, true)
 
     into(base == DockerBase.IRON_BANK ? 'scripts' : 'bin') {
       from configurations.transformLog4jJar
     }
 
     if (architecture == Architecture.AARCH64) {
-      if (oss) {
-        from configurations.aarch64OssDockerSource
-      } else {
         from configurations.aarch64DockerSource
-      }
     } else {
-      if (oss) {
-        from configurations.ossDockerSource
-      } else {
         from configurations.dockerSource
-      }
     }
   }
 }
@@ -220,14 +198,11 @@ tasks.register("copyNodeKeyMaterial", Sync) {
 
 elasticsearch_distributions {
   Architecture.values().each { eachArchitecture ->
-    Flavor.values().each { distroFlavor ->
-      "docker_$distroFlavor${ eachArchitecture == Architecture.AARCH64 ? '_aarch64' : '' }" {
-        architecture = eachArchitecture
-        flavor = distroFlavor
-        type = 'docker'
-        version = VersionProperties.getElasticsearch()
-        failIfUnavailable = false // This ensures we don't attempt to build images if docker is unavailable
-      }
+    "docker_${ eachArchitecture == Architecture.AARCH64 ? '_aarch64' : '' }" {
+      architecture = eachArchitecture
+      type = 'docker'
+      version = VersionProperties.getElasticsearch()
+      failIfUnavailable = false // This ensures we don't attempt to build images if docker is unavailable
     }
   }
 }
@@ -270,15 +245,11 @@ tasks.named("check").configure {
   dependsOn "integTest"
 }
 
-void addBuildDockerImage(Architecture architecture, boolean oss, DockerBase base) {
-  if (oss && base != DockerBase.CENTOS) {
-    throw new GradleException("The only allowed docker base image for OSS builds is CENTOS")
-  }
-
+void addBuildDockerImage(Architecture architecture, DockerBase base) {
   final TaskProvider<DockerBuildTask> buildDockerImageTask =
-          tasks.register(taskName("build", architecture, oss, base, "DockerImage"), DockerBuildTask) {
+          tasks.register(taskName("build", architecture, base, "DockerImage"), DockerBuildTask) {
     onlyIf { Architecture.current() == architecture }
-    TaskProvider<Sync> copyContextTask = tasks.named(taskName("copy", architecture, oss, base, "DockerContext"))
+    TaskProvider<Sync> copyContextTask = tasks.named(taskName("copy", architecture, base, "DockerContext"))
     dependsOn(copyContextTask)
     dockerContext.fileProvider(copyContextTask.map { it.destinationDir })
 
@@ -289,20 +260,13 @@ void addBuildDockerImage(Architecture architecture, boolean oss, DockerBase base
     }
 
     String version = VersionProperties.elasticsearch
-    if (oss) {
-      tags = [
-        "docker.elastic.co/elasticsearch/elasticsearch-oss:${version}",
-        "elasticsearch-oss:test"
-      ]
-    } else {
-      String suffix = base == DockerBase.UBI ? '-ubi8' : ''
-      tags = [
-        "elasticsearch${suffix}:${version}",
-        "docker.elastic.co/elasticsearch/elasticsearch${suffix}:${version}",
-        "docker.elastic.co/elasticsearch/elasticsearch-full${suffix}:${version}",
-        "elasticsearch${suffix}:test",
-      ]
-    }
+    String suffix = base == DockerBase.UBI ? '-ubi8' : ''
+    tags = [
+      "elasticsearch${suffix}:${version}",
+      "docker.elastic.co/elasticsearch/elasticsearch${suffix}:${version}",
+      "docker.elastic.co/elasticsearch/elasticsearch-full${suffix}:${version}",
+      "elasticsearch${suffix}:test"
+    ]
   }
   tasks.named("assemble").configure {
     dependsOn(buildDockerImageTask)
@@ -315,15 +279,8 @@ for (final Architecture architecture : Architecture.values()) {
       // At the moment we don't actually build the Iron Bank image
       continue
     }
-    for (final boolean oss : [false, true]) {
-      if (oss && base != DockerBase.CENTOS) {
-        // We only create Docker images for the OSS distribution on CentOS.
-        // Other bases only use the default distribution.
-        continue
-      }
-      addCopyDockerContextTask(architecture, oss, base)
-      addBuildDockerImage(architecture, oss, base)
-    }
+    addCopyDockerContextTask(architecture, base)
+    addBuildDockerImage(architecture, base)
   }
 }
 
@@ -343,18 +300,17 @@ subprojects { Project subProject ->
     apply plugin: 'distribution'
 
     final Architecture architecture = subProject.name.contains('aarch64-') ? Architecture.AARCH64 : Architecture.X64
-    final boolean oss = subProject.name.contains('oss-')
     // We can ignore Iron Bank at the moment as we don't
     // build those images ourselves.
     final DockerBase base = subProject.name.contains('ubi-') ? DockerBase.UBI : DockerBase.CENTOS
 
     final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
-    final String suffix = oss ? '-oss' : base == DockerBase.UBI ? '-ubi8' : ''
+    final String suffix = base == DockerBase.UBI ? '-ubi8' : ''
     final String extension = base == DockerBase.UBI ? 'ubi.tar' : 'docker.tar'
     final String artifactName = "elasticsearch${arch}${suffix}_test"
 
-    final String exportTaskName = taskName("export", architecture, oss, base, "DockerImage")
-    final String buildTaskName = taskName("build", architecture, oss, base, "DockerImage")
+    final String exportTaskName = taskName("export", architecture, base, "DockerImage")
+    final String buildTaskName = taskName("build", architecture, base, "DockerImage")
     final String tarFile = "${parent.projectDir}/build/${artifactName}_${VersionProperties.elasticsearch}.${extension}"
 
     tasks.register(exportTaskName, LoggedExec) {

distribution/docker/oss-docker-aarch64-export/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.

distribution/docker/oss-docker-build-context/build.gradle

@@ -1,14 +0,0 @@
-import org.elasticsearch.gradle.DockerBase
-
-apply plugin: 'base'
-
-tasks.register("buildOssDockerBuildContext", Tar) {
-  archiveExtension = 'tar.gz'
-  compression = Compression.GZIP
-  archiveClassifier = "docker-build-context"
-  archiveBaseName = "elasticsearch-oss"
-  // Non-local builds don't need to specify an architecture.
-  with dockerBuildContext(null, true, DockerBase.CENTOS, false)
-}
-
-tasks.named("assemble").configure { dependsOn "buildOssDockerBuildContext" }

distribution/docker/oss-docker-export/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.

distribution/packages/aarch64-oss-deb/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/packages/aarch64-oss-rpm/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/packages/build.gradle

@@ -145,7 +145,7 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk, String archit
         with libFiles(oss)
       }
       into('modules') {
-        with modulesFiles(oss, 'linux-' + ((architecture == 'x64') ? 'x86_64' : architecture))
+        with modulesFiles('linux-' + ((architecture == 'x64') ? 'x86_64' : architecture))
       }
       if (jdk) {
         into('jdk') {

distribution/packages/oss-deb/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/packages/oss-no-jdk-deb/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/packages/oss-no-jdk-rpm/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

distribution/packages/oss-rpm/build.gradle

@@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// distribution is done in the parent project.

gradle/local-distribution.gradle

@@ -18,7 +18,6 @@ apply plugin:'elasticsearch.internal-distribution-download'
 
 elasticsearch_distributions {
   local {
-    flavor = 'default'
     type = 'archive'
     architecture = Architecture.current()
   }

qa/remote-clusters/build.gradle

@@ -38,7 +38,6 @@ elasticsearch_distributions {
   docker {
     type = 'docker'
     architecture = Architecture.current()
-    flavor = System.getProperty('tests.distribution', 'default')
     version = VersionProperties.getElasticsearch()
     failIfUnavailable = false // This ensures we skip this testing if Docker is unavailable
   }

qa/smoke-test-multinode/build.gradle

@@ -28,11 +28,9 @@ tasks.named("integTest").configure {
     project.delete(repo)
     repo.mkdirs()
   }
-  if ('default'.equalsIgnoreCase(System.getProperty('tests.distribution', 'oss'))) {
-    systemProperty 'tests.rest.blacklist', [
-      'cat.templates/10_basic/No templates',
-      'cat.templates/10_basic/Sort templates',
-      'cat.templates/10_basic/Multiple template',
-    ].join(',')
-  }
+  systemProperty 'tests.rest.blacklist', [
+    'cat.templates/10_basic/No templates',
+    'cat.templates/10_basic/Sort templates',
+    'cat.templates/10_basic/Multiple template',
+  ].join(',')
 }

qa/wildfly/build.gradle

@@ -46,7 +46,6 @@ elasticsearch_distributions {
   docker {
     type = 'docker'
     architecture = Architecture.current()
-    flavor = System.getProperty('tests.distribution', 'oss')
     version = VersionProperties.getElasticsearch()
     failIfUnavailable = false // This ensures we skip this testing if Docker is unavailable
   }
@@ -57,11 +56,7 @@ tasks.named("preProcessFixture").configure {
 }
 
 dockerCompose {
-  if ('default'.equalsIgnoreCase(System.getProperty('tests.distribution', 'oss'))) {
     useComposeFiles = ['docker-compose.yml']
-  } else {
-    useComposeFiles = ['docker-compose-oss.yml']
-  }
 }
 
 tasks.register("integTest", Test) {

settings.gradle

@@ -18,23 +18,14 @@ List projects = [
   'client:benchmark',
   'benchmarks',
   'distribution:archives:integ-test-zip',
-  'distribution:archives:oss-windows-zip',
   'distribution:archives:windows-zip',
-  'distribution:archives:oss-no-jdk-windows-zip',
   'distribution:archives:no-jdk-windows-zip',
-  'distribution:archives:oss-darwin-tar',
   'distribution:archives:darwin-tar',
   'distribution:archives:darwin-aarch64-tar',
-  'distribution:archives:oss-darwin-aarch64-tar',
-  'distribution:archives:oss-no-jdk-darwin-tar',
   'distribution:archives:no-jdk-darwin-tar',
-  'distribution:archives:oss-no-jdk-darwin-aarch64-tar',
   'distribution:archives:no-jdk-darwin-aarch64-tar',
-  'distribution:archives:oss-linux-aarch64-tar',
-  'distribution:archives:oss-linux-tar',
   'distribution:archives:linux-aarch64-tar',
   'distribution:archives:linux-tar',
-  'distribution:archives:oss-no-jdk-linux-tar',
   'distribution:archives:no-jdk-linux-tar',
   'distribution:docker',
   'distribution:docker:docker-aarch64-build-context',
@@ -42,25 +33,15 @@ List projects = [
   'distribution:docker:docker-build-context',
   'distribution:docker:docker-export',
   'distribution:docker:ironbank-docker-build-context',
-  'distribution:docker:oss-docker-aarch64-build-context',
-  'distribution:docker:oss-docker-aarch64-export',
-  'distribution:docker:oss-docker-build-context',
-  'distribution:docker:oss-docker-export',
   'distribution:docker:transform-log4j-config',
   'distribution:docker:ubi-docker-aarch64-export',
   'distribution:docker:ubi-docker-build-context',
   'distribution:docker:ubi-docker-export',
-  'distribution:packages:aarch64-oss-deb',
-  'distribution:packages:oss-deb',
   'distribution:packages:aarch64-deb',
   'distribution:packages:deb',
-  'distribution:packages:oss-no-jdk-deb',
   'distribution:packages:no-jdk-deb',
-  'distribution:packages:aarch64-oss-rpm',
-  'distribution:packages:oss-rpm',
   'distribution:packages:aarch64-rpm',
   'distribution:packages:rpm',
-  'distribution:packages:oss-no-jdk-rpm',
   'distribution:packages:no-jdk-rpm',
   'distribution:bwc:bugfix',
   'distribution:bwc:maintenance',

x-pack/test/idp-fixture/build.gradle

@@ -18,7 +18,6 @@ elasticsearch_distributions {
   docker {
     type = 'docker'
     architecture = Architecture.current()
-    flavor = System.getProperty('tests.distribution', 'default')
     version = VersionProperties.getElasticsearch()
     failIfUnavailable = false // This ensures we skip this testing if Docker is unavailable
   }