Skip to content

[3.4] Ensure all modules are included in INTEG_TEST testcluster distribution #20243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cwperks wants to merge 2 commits into from
Closed

[3.4] Ensure all modules are included in INTEG_TEST testcluster distribution #20243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b526de6
Ensure all modules are included in INTEG_TEST testcluster distribution
cwperks Dec 15, 2025
aaa1183
Add to release notes
cwperks Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions distribution/archives/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* under the License.
*/

import org.opensearch.gradle.JavaPackageType
import org.opensearch.gradle.JavaPackageType

apply plugin: 'opensearch.internal-distribution-archive-setup'

Expand Down Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -193,7 +193,7 @@ distribution_archives {
}
}


linuxPpc64leTar {
archiveClassifier = 'linux-ppc64le'
content {
Expand Down
23 changes: 10 additions & 13 deletions distribution/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -407,8 +404,8 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
}

transportModulesFiles = copySpec {
from buildTransportModulesTaskProvider
integTestModulesFiles = copySpec {
from buildIntegTestModulesTaskProvider
}

configFiles = { distributionType, java ->
Expand Down
1 change: 1 addition & 0 deletions release-notes/opensearch.release-notes-3.4.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Compatible with OpenSearch and OpenSearch Dashboards version 3.4.0
- Refactor the ShardStats, WarmerStats and IndexingPressureStats class to use the Builder pattern instead of constructors ([#19966](https://github.com/opensearch-project/OpenSearch/pull/19966))
- Add skiplist optimization to auto_date_histogram aggregation ([#20057](https://github.com/opensearch-project/OpenSearch/pull/20057))
- Throw exceptions for currently unsupported GRPC request-side fields ([#20162](https://github.com/opensearch-project/OpenSearch/pull/20162))
- Ensure all modules are included in INTEG_TEST testcluster distribution ([#20241](https://github.com/opensearch-project/OpenSearch/pull/20241))

### Fixed
- Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))
Expand Down
Loading