Ensure all modules are included in INTEG_TEST testcluster distribution

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Handle custom metadata files in subdirectory-store ([#20157](https://github.com/opensearch-project/OpenSearch/pull/20157))
 - Add support for missing proto fields in GRPC FunctionScore and Highlight ([#20169](https://github.com/opensearch-project/OpenSearch/pull/20169))
+- Ensure all modules are included in INTEG_TEST testcluster distribution ([#20241](https://github.com/opensearch-project/OpenSearch/pull/20241))
 
 ### Fixed
 - Fix bug of warm index: FullFileCachedIndexInput was closed error ([#20055](https://github.com/opensearch-project/OpenSearch/pull/20055))

distribution/archives/build.gradle

@@ -28,7 +28,7 @@
  * under the License.
  */
 
-import org.opensearch.gradle.JavaPackageType 
+import org.opensearch.gradle.JavaPackageType
 
 apply plugin: 'opensearch.internal-distribution-archive-setup'
 
@@ -103,7 +103,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
 distribution_archives {
   integTestZip {
     content {
-      archiveFiles(transportModulesFiles, 'zip', null, 'x64', JavaPackageType.NONE)
+      archiveFiles(integTestModulesFiles, 'zip', null, 'x64', JavaPackageType.NONE)
     }
   }
 
@@ -193,7 +193,7 @@ distribution_archives {
     }
   }
 
-  
+
   linuxPpc64leTar {
     archiveClassifier = 'linux-ppc64le'
     content {

distribution/build.gradle

@@ -91,7 +91,7 @@ tasks.withType(NoticeTask).configureEach {
  *****************************************************************************/
 String distOutputs = 'build/outputs/dist'
 String systemdOutputs = 'build/outputs/systemd'
-String transportOutputs = 'build/outputs/transport-only'
+String integTestOutputs = 'build/outputs/integ-test'
 String externalTestOutputs = 'build/outputs/external-test'
 
 def processOutputsTaskProvider = tasks.register("processOutputs", Sync) {
@@ -106,10 +106,9 @@ def processExternalTestOutputsTaskProvider = tasks.register("processExternalTest
   into externalTestOutputs
 }
 
-// Integ tests work over the rest http layer, so we need a transport included with the integ test zip.
-// All transport modules are included so that they may be randomized for testing
-def processTransportOutputsTaskProvider = tasks.register("processTransportOutputs", Sync) {
-  into transportOutputs
+// Copy all modules to integ test build to ensure integ test and min distro behavior is the same since modules are mandatory
+def processIntegTestModulesOutputsTaskProvider = tasks.register("processIntegTestOutputs", Sync) {
+  into integTestOutputs
 }
 
 // these are dummy tasks that can be used to depend on the relevant sub output dir
@@ -129,9 +128,9 @@ def buildSystemdModuleTaskProvider = tasks.register("buildSystemdModule") {
   dependsOn "processSystemdOutputs"
   outputs.dir "${systemdOutputs}/modules"
 }
-def buildTransportModulesTaskProvider = tasks.register("buildTransportModules") {
-  dependsOn processTransportOutputsTaskProvider
-  outputs.dir "${transportOutputs}/modules"
+def buildIntegTestModulesTaskProvider = tasks.register("buildIntegTestModules") {
+  dependsOn processIntegTestModulesOutputsTaskProvider
+  outputs.dir "${integTestOutputs}/modules"
 }
 def buildExternalTestModulesTaskProvider = tasks.register("buildExternalTestModules") {
   dependsOn "processExternalTestOutputs"
@@ -230,9 +229,7 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
   }
 
   copyModule(processOutputsTaskProvider, module)
-  if (module.name.startsWith('transport-')) {
-    copyModule(processTransportOutputsTaskProvider, module)
-  }
+  copyModule(processIntegTestModulesOutputsTaskProvider, module)
 
   copyLog4jProperties(buildLog4jConfigTaskProvider, module)
 
@@ -407,8 +404,8 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
       }
     }
 
-    transportModulesFiles = copySpec {
-      from buildTransportModulesTaskProvider
+    integTestModulesFiles = copySpec {
+      from buildIntegTestModulesTaskProvider
     }
 
     configFiles = { distributionType, java ->

modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/71_context_api.yml

@@ -2,7 +2,7 @@
     - do:
         scripts_painless_context: {}
     - match: { contexts.0: aggregation_selector}
-    - match: { contexts.25: update}
+    - match: { contexts.26: update}
 ---
 
 "Action to get all API values for score context":