Cleanup default flavor stragglers from docker distributions. (#481)

This commit removes the references for the `default` docker distributions which were originally part of the different flavors of distributions. This also fixes some of the failing docker compose tests under `qa`.

Signed-off-by: Rabi Panda <adnapibar@gmail.com>

Author: adnapibar

distribution/build.gradle

@@ -58,17 +58,10 @@ tasks.register("generateDependenciesReport", ConcatFilesTask) {
 // integ test zip only uses server, so a different notice file is needed there
 def buildServerNoticeTaskProvider = tasks.register("buildServerNotice", NoticeTask)
 
-// other distributions include notices from modules as well, which are added below later
-def buildDefaultNoticeTaskProvider = tasks.register("buildDefaultNotice", NoticeTask) {
-  licensesDir new File(project(':distribution').projectDir, 'licenses')
-}
-
 def buildOssNoticeTaskProvider = tasks.register("buildOssNotice", NoticeTask) {
   licensesDir new File(project(':distribution').projectDir, 'licenses')
 }
 
-def buildDefaultNoJdkNoticeTaskProvider = tasks.register("buildDefaultNoJdkNotice", NoticeTask)
-
 def buildOssNoJdkNoticeTaskProvider = tasks.register("buildOssNoJdkNotice", NoticeTask)
 
 // The :server and :libs projects belong to all distributions
@@ -85,7 +78,6 @@ tasks.withType(NoticeTask).configureEach {
  *                                  Modules                                  *
  *****************************************************************************/
 String ossOutputs = 'build/outputs/oss'
-String defaultOutputs = 'build/outputs/default'
 String systemdOutputs = 'build/outputs/systemd'
 String transportOutputs = 'build/outputs/transport-only'
 String externalTestOutputs = 'build/outputs/external-test'
@@ -94,11 +86,6 @@ def processOssOutputsTaskProvider = tasks.register("processOssOutputs", Sync) {
   into ossOutputs
 }
 
-def processDefaultOutputsTaskProvider = tasks.register("processDefaultOutputs", Sync) {
-  into defaultOutputs
-  from processOssOutputsTaskProvider
-}
-
 def processSystemdOutputsTaskProvider = tasks.register("processSystemdOutputs", Sync) {
   into systemdOutputs
 }
@@ -126,18 +113,6 @@ tasks.register("buildOssConfig") {
   dependsOn "processOssOutputs"
   outputs.dir "${ossOutputs}/config"
 }
-def buildDefaultModulesTaskProvider = tasks.register("buildDefaultModules") {
-  dependsOn processDefaultOutputsTaskProvider
-  outputs.dir "${defaultOutputs}/modules"
-}
-tasks.register("buildDefaultBin") {
-  dependsOn processDefaultOutputsTaskProvider
-  outputs.dir "${defaultOutputs}/bin"
-}
-def buildDefaultConfigTaskProvider = tasks.register("buildDefaultConfig") {
-  dependsOn processOssOutputsTaskProvider
-  outputs.dir "${defaultOutputs}/config"
-}
 def buildSystemdModuleTaskProvider = tasks.register("buildSystemdModule") {
   dependsOn "processSystemdOutputs"
   outputs.dir "${systemdOutputs}/modules"
@@ -192,12 +167,6 @@ def buildOssLog4jConfigTaskProvider = tasks.register("buildOssLog4jConfig") {
   ext.log4jFile = file("${ossOutputs}/log4j2.properties")
   outputs.file log4jFile
 }
-def buildDefaultLog4jConfigTaskProvider = tasks.register("buildDefaultLog4jConfig") {
-  dependsOn processDefaultOutputsTaskProvider
-  ext.contents = []
-  ext.log4jFile = file("${defaultOutputs}/log4j2.properties")
-  outputs.file log4jFile
-}
 
 Closure writeLog4jProperties = {
   String mainLog4jProperties = file('src/config/log4j2.properties').getText('UTF-8')
@@ -210,10 +179,6 @@ buildOssLog4jConfigTaskProvider.configure {
   doLast(writeLog4jProperties)
 }
 
-buildDefaultLog4jConfigTaskProvider.configure {
-  doLast(writeLog4jProperties)
-}
-
 // copy log4j2.properties from modules that have it
 void copyLog4jProperties(TaskProvider buildTask, Project module) {
   buildTask.configure {
@@ -246,10 +211,6 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
   }
   File licenses = new File(module.projectDir, 'licenses')
   if (licenses.exists()) {
-    buildDefaultNoticeTaskProvider.configure {
-      licensesDir licenses
-      source module.file('src/main/java')
-    }
     buildOssNotice.configure {
       licensesDir licenses
       source module.file('src/main/java')
@@ -262,7 +223,6 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
   }
 
   copyLog4jProperties(buildOssLog4jConfigTaskProvider, module)
-  copyLog4jProperties(buildDefaultLog4jConfigTaskProvider, module)
 
   restTestExpansions['expected.modules.count'] += 1
 }

distribution/docker/build.gradle

@@ -182,8 +182,7 @@ void addBuildDockerImage(Architecture architecture, DockerBase base) {
 
     String version = VersionProperties.getOpenSearch()
       tags = [
-        //TODO remove the tag and replace with OpenSearch docker tag
-        "docker.elastic.co/elasticsearch/elasticsearch-oss:${version}",
+        "docker.opensearch.org/opensearch/opensearch-oss:${version}",
         "opensearch-oss:test"
       ]
   }

distribution/docker/docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3'
 services:
   opensearch-oss-1:
-    image: opensearch:test
+    image: opensearch-oss:test
     environment:
        - node.name=opensearch-oss-1
        - cluster.initial_master_nodes=opensearch-oss-1,opensearch-oss-2
@@ -26,7 +26,7 @@ services:
         soft: -1
         hard: -1
   opensearch-oss-2:
-    image: opensearch:test
+    image: opensearch-oss:test
     environment:
        - node.name=opensearch-oss-2
        - cluster.initial_master_nodes=opensearch-oss-1,opensearch-oss-2

distribution/docker/docker-test-entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd /usr/share/opensearch/bin/
-echo "testnode" > /tmp/password
+
 /usr/local/bin/docker-entrypoint.sh | tee > /usr/share/opensearch/logs/console.log

distribution/docker/src/test/java/org/opensearch/docker/test/DockerYmlTestSuiteIT.java

@@ -19,27 +19,16 @@
 package org.opensearch.docker.test;
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-import org.opensearch.OpenSearchException;
+import org.junit.Before;
 import org.opensearch.client.Request;
-import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 
 public class DockerYmlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase {
 
-    private static final String USER = "rest_user";
-    private static final String PASS = "test-password";
-    private static final String KEYSTORE_PASS = "testnode";
-
     public DockerYmlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
         super(testCandidate);
     }
@@ -83,25 +72,6 @@ public void waitForCluster() throws IOException {
         client().performRequest(health);
     }
 
-    static Path keyStore;
-
-    @BeforeClass
-    public static void getKeyStore() {
-        try {
-            keyStore = PathUtils.get(DockerYmlTestSuiteIT.class.getResource("/testnode.jks").toURI());
-        } catch (URISyntaxException e) {
-            throw new OpenSearchException("exception while reading the store", e);
-        }
-        if (Files.exists(keyStore) == false) {
-            throw new IllegalStateException("Keystore file [" + keyStore + "] does not exist.");
-        }
-    }
-
-    @AfterClass
-    public static void clearKeyStore() {
-        keyStore = null;
-    }
-
     @Override
     protected Settings restClientSettings() {
         return super.restClientSettings();

qa/remote-clusters/build.gradle

@@ -31,15 +31,11 @@ dependencies {
   testImplementation project(':client:rest-high-level')
 }
 
-/**
- * TODO OpenSearch - this task is currently broken and temporarily commented out to
- * unblock the pre-commit.
- * Issue URL - https://github.com/opensearch-project/OpenSearch/issues/400
 opensearch_distributions {
   docker {
     type = 'docker'
     architecture = Architecture.current()
-    version = VersionProperties.getElasticsearch()
+    version = VersionProperties.getOpenSearch()
     failIfUnavailable = false // This ensures we skip this testing if Docker is unavailable
   }
 }
@@ -49,23 +45,19 @@ preProcessFixture {
   doLast {
     // tests expect to have an empty repo
     project.delete(
-      "${buildDir}/repo",
       "${buildDir}/oss-repo"
     )
     createAndSetWritable(
-      "${buildDir}/repo",
       "${buildDir}/oss-repo",
-      "${buildDir}/logs/default-1",
-      "${buildDir}/logs/default-2",
       "${buildDir}/logs/oss-1",
       "${buildDir}/logs/oss-2"
     )
   }
 }
-*/
+
 dockerCompose {
   tcpPortsToIgnoreWhenWaiting = [9600, 9601]
-  useComposeFiles = ['docker-compose-oss.yml']
+  useComposeFiles = ['docker-compose.yml']
 }
 
 def createAndSetWritable(Object... locations) {