Skip to content
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.

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

[Backport] [2.x] Add missing no jdk distributions (#4722) #4884

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Introduce Remote translog feature flag([#4158](https://github.com/opensearch-project/OpenSearch/pull/4158))
- Add groupId value propagation tests for ZIP publication task ([#4848](https://github.com/opensearch-project/OpenSearch/pull/4848))
- Add support for GeoJson Point type in GeoPoint field ([#4597](https://github.com/opensearch-project/OpenSearch/pull/4597))
- Added missing no-jdk distributions ([#4722](https://github.com/opensearch-project/OpenSearch/pull/4722))

### Dependencies
- Bumps `com.diffplug.spotless` from 6.9.1 to 6.10.0
Expand Down
12 changes: 12 additions & 0 deletions distribution/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Distributions
This subproject contains the necessary tooling to build the various distributions.
Note that some of this can only be run on the specific architecture and does not support cross-compile.

The following distributions are being built:
* Archives (`*.zip`, `*.tar`): these form the basis for all other OpenSearch distributions
* Packages (`*.deb`, `*.rpm`): specific package formats for some Linux distributions
* Docker images
* Backwards compatibility tests: used internally for version compatibility testing, not for public consumption

## With or Without JDK?
For each supported platform there should be both a target bundled with a JDK and a target without a bundled JDK.
9 changes: 9 additions & 0 deletions distribution/archives/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ distribution_archives {
}
}

noJdkLinuxArm64Tar {
archiveClassifier = 'no-jdk-linux-arm64'
content {
archiveFiles(modulesFiles('linux-arm64'), 'tar', 'linux', 'arm64', false)
}
}

linuxTar {
archiveClassifier = 'linux-x64'
content {
Expand All @@ -151,6 +158,8 @@ distribution_archives {
}
}

// Should really be `no-jdk-linux-s390x` as it ships without a JDK, however it seems that the build can't handle
// the absence of the `linux-s390x` target.
linuxS390xTar {
archiveClassifier = 'linux-s390x'
content {
Expand Down
8 changes: 8 additions & 0 deletions distribution/packages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,10 @@ tasks.register('buildArm64Deb', Deb) {
configure(commonDebConfig(true, 'arm64'))
}

tasks.register('buildNoJdkArm64Deb', Deb) {
configure(commonDebConfig(false, 'arm64'))
}

tasks.register('buildDeb', Deb) {
configure(commonDebConfig(true, 'x64'))
}
Expand Down Expand Up @@ -387,6 +391,10 @@ tasks.register('buildArm64Rpm', Rpm) {
configure(commonRpmConfig(true, 'arm64'))
}

tasks.register('buildNoJdkArm64Rpm', Rpm) {
configure(commonRpmConfig(false, 'arm64'))
}

tasks.register('buildRpm', Rpm) {
configure(commonRpmConfig(true, 'x64'))
}
Expand Down
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ List projects = [
'distribution:archives:freebsd-tar',
'distribution:archives:no-jdk-freebsd-tar',
'distribution:archives:linux-arm64-tar',
'distribution:archives:no-jdk-linux-arm64-tar',
'distribution:archives:linux-s390x-tar',
'distribution:archives:linux-tar',
'distribution:archives:no-jdk-linux-tar',
Expand All @@ -57,9 +58,11 @@ List projects = [
'distribution:docker:docker-build-context',
'distribution:docker:docker-export',
'distribution:packages:arm64-deb',
'distribution:packages:no-jdk-arm64-deb',
'distribution:packages:deb',
'distribution:packages:no-jdk-deb',
'distribution:packages:arm64-rpm',
'distribution:packages:no-jdk-arm64-rpm',
'distribution:packages:rpm',
'distribution:packages:no-jdk-rpm',
'distribution:bwc:bugfix',
Expand Down