Skip to content

Commit 8a9ea85

Browse files
mark-vieiramark-vieira
authored
Remove no-jdk distributions (#76896)
1 parent 5c00587 commit 8a9ea85

File tree

12 files changed

+72
-224
lines changed

12 files changed

+72
-224
lines changed

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -364,38 +364,16 @@ private List<ElasticsearchDistribution> configureDistributions(Project project)
364364
List<ElasticsearchDistribution> currentDistros = new ArrayList<>();
365365

366366
for (Architecture architecture : Architecture.values()) {
367-
ALL_INTERNAL.stream().forEach(type -> {
368-
for (boolean bundledJdk : Arrays.asList(true, false)) {
369-
if (bundledJdk == false) {
370-
// We'll never publish an ARM (aarch64) build without a bundled JDK.
371-
if (architecture == Architecture.AARCH64) {
372-
continue;
373-
}
374-
// All our Docker images include a bundled JDK so it doesn't make sense to test without one.
375-
if (type.isDocker()) {
376-
continue;
377-
}
378-
}
379-
currentDistros.add(
380-
createDistro(distributions, architecture, type, null, bundledJdk, VersionProperties.getElasticsearch())
381-
);
382-
}
383-
});
367+
ALL_INTERNAL.stream().forEach(type -> currentDistros.add(
368+
createDistro(distributions, architecture, type, null, true, VersionProperties.getElasticsearch())
369+
));
384370
}
385371

386372
for (Architecture architecture : Architecture.values()) {
387373
for (Platform platform : Arrays.asList(Platform.LINUX, Platform.WINDOWS)) {
388-
for (boolean bundledJdk : Arrays.asList(true, false)) {
389-
if (bundledJdk == false && architecture != Architecture.X64) {
390-
// We will never publish distributions for non-x86 (amd64) platforms
391-
// without a bundled JDK
392-
continue;
393-
}
394-
395-
currentDistros.add(
396-
createDistro(distributions, architecture, ARCHIVE, platform, bundledJdk, VersionProperties.getElasticsearch())
397-
);
398-
}
374+
currentDistros.add(
375+
createDistro(distributions, architecture, ARCHIVE, platform, true, VersionProperties.getElasticsearch())
376+
);
399377
}
400378
}
401379

‎distribution/archives/build.gradle

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ import java.nio.file.Path
1111

1212
apply plugin: 'elasticsearch.internal-distribution-archive-setup'
1313

14-
CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String platform, String architecture, boolean oss, boolean jdk) {
14+
CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String platform, String architecture, boolean isTestDistro) {
1515
return copySpec {
1616
into("elasticsearch-${version}") {
1717
into('lib') {
18-
with libFiles(oss)
18+
with libFiles(isTestDistro)
1919
}
2020
into('config') {
2121
dirMode 0750
2222
fileMode 0660
23-
with configFiles(distributionType, oss, jdk)
23+
with configFiles(distributionType, isTestDistro)
2424
from {
2525
dirMode 0750
2626
jvmOptionsDir.getParent()
2727
}
2828
}
2929
into('bin') {
30-
with binFiles(distributionType, oss, jdk)
30+
with binFiles(distributionType, isTestDistro)
3131
}
32-
if (jdk) {
33-
into("darwin".equals(platform) ? 'jdk.app' : 'jdk') {
32+
into("darwin".equals(platform) ? 'jdk.app' : 'jdk') {
33+
if (isTestDistro == false) {
3434
with jdkFiles(project, platform, architecture)
3535
}
3636
}
@@ -50,11 +50,11 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
5050
include 'README.asciidoc'
5151
}
5252
from(rootProject.file('licenses')) {
53-
include oss ? 'SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'
53+
include isTestDistro ? 'SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'
5454
rename { 'LICENSE.txt' }
5555
}
5656

57-
with noticeFile(oss, jdk)
57+
with noticeFile(isTestDistro)
5858
into('modules') {
5959
with modulesFiles
6060
}
@@ -65,70 +65,42 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
6565
distribution_archives {
6666
integTestZip {
6767
content {
68-
archiveFiles(transportModulesFiles, 'zip', null, 'x64', true, false)
68+
archiveFiles(transportModulesFiles, 'zip', null, 'x64', true)
6969
}
7070
}
7171

7272
windowsZip {
7373
archiveClassifier = 'windows-x86_64'
7474
content {
75-
archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false, true)
76-
}
77-
}
78-
79-
noJdkWindowsZip {
80-
archiveClassifier = 'no-jdk-windows-x86_64'
81-
content {
82-
archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false, false)
75+
archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false)
8376
}
8477
}
8578

8679
darwinTar {
8780
archiveClassifier = 'darwin-x86_64'
8881
content {
89-
archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false, true)
82+
archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false)
9083
}
9184
}
9285

9386
darwinAarch64Tar {
9487
archiveClassifier = 'darwin-aarch64'
9588
content {
96-
archiveFiles(modulesFiles('darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, true)
97-
}
98-
}
99-
100-
noJdkDarwinTar {
101-
archiveClassifier = 'no-jdk-darwin-x86_64'
102-
content {
103-
archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false, false)
104-
}
105-
}
106-
107-
noJdkDarwinAarch64Tar {
108-
archiveClassifier = 'no-jdk-darwin-aarch64'
109-
content {
110-
archiveFiles(modulesFiles('darwin-aarch64'), 'tar', 'darwin', 'aarch64', false, false)
89+
archiveFiles(modulesFiles('darwin-aarch64'), 'tar', 'darwin', 'aarch64', false)
11190
}
11291
}
11392

11493
linuxAarch64Tar {
11594
archiveClassifier = 'linux-aarch64'
11695
content {
117-
archiveFiles(modulesFiles('linux-aarch64'), 'tar', 'linux', 'aarch64', false, true)
96+
archiveFiles(modulesFiles('linux-aarch64'), 'tar', 'linux', 'aarch64', false)
11897
}
11998
}
12099

121100
linuxTar {
122101
archiveClassifier = 'linux-x86_64'
123102
content {
124-
archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false, true)
125-
}
126-
}
127-
128-
noJdkLinuxTar {
129-
archiveClassifier = 'no-jdk-linux-x86_64'
130-
content {
131-
archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false, false)
103+
archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false)
132104
}
133105
}
134106
}

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎distribution/build.gradle

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ def buildDefaultNoticeTaskProvider = tasks.register("buildDefaultNotice", Notice
6969
licensesDir new File(project(':distribution').projectDir, 'licenses')
7070
}
7171

72-
def buildDefaultNoJdkNoticeTaskProvider = tasks.register("buildDefaultNoJdkNotice", NoticeTask)
73-
74-
def buildOssNoJdkNoticeTaskProvider = tasks.register("buildOssNoJdkNotice", NoticeTask)
75-
7672
// The :server and :libs projects belong to all distributions
7773
tasks.withType(NoticeTask).configureEach {
7874
licensesDir project(':server').file('licenses')
@@ -86,7 +82,6 @@ tasks.withType(NoticeTask).configureEach {
8682
/*****************************************************************************
8783
* Modules *
8884
*****************************************************************************/
89-
String ossOutputs = 'build/outputs/oss'
9085
String defaultOutputs = 'build/outputs/default'
9186
String systemdOutputs = 'build/outputs/systemd'
9287
String transportOutputs = 'build/outputs/transport-only'
@@ -354,36 +349,36 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
354349
from buildTransportModulesTaskProvider
355350
}
356351

357-
configFiles = { distributionType, testDistro, jdk ->
352+
configFiles = { distributionType, isTestDistro ->
358353
copySpec {
359354
with copySpec {
360355
// main config files, processed with distribution specific substitutions
361356
from '../src/config'
362357
exclude 'log4j2.properties' // this is handled separately below
363-
filter("tokens" : expansionsForDistribution(distributionType, testDistro, jdk), ReplaceTokens.class)
358+
filter("tokens" : expansionsForDistribution(distributionType, isTestDistro), ReplaceTokens.class)
364359
}
365360
from buildDefaultLog4jConfigTaskProvider
366361
from defaultConfigFiles
367362
}
368363
}
369364

370-
binFiles = { distributionType, testDistro, jdk ->
365+
binFiles = { distributionType, testDistro ->
371366
copySpec {
372367
// non-windows files, for all distributions
373368
with copySpec {
374369
from '../src/bin'
375370
exclude '*.exe'
376371
exclude '*.bat'
377372
eachFile { it.setMode(0755) }
378-
filter("tokens" : expansionsForDistribution(distributionType, testDistro, jdk), ReplaceTokens.class)
373+
filter("tokens" : expansionsForDistribution(distributionType, testDistro), ReplaceTokens.class)
379374
}
380375
// windows files, only for zip
381376
if (distributionType == 'zip') {
382377
with copySpec {
383378
from '../src/bin'
384379
include '*.bat'
385380
filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf'))
386-
filter("tokens" : expansionsForDistribution(distributionType, testDistro, jdk), ReplaceTokens.class)
381+
filter("tokens" : expansionsForDistribution(distributionType, testDistro), ReplaceTokens.class)
387382
}
388383
with copySpec {
389384
from '../src/bin'
@@ -403,16 +398,12 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
403398
}
404399
}
405400

406-
noticeFile = { testDistro, jdk ->
401+
noticeFile = { testDistro ->
407402
copySpec {
408403
if (testDistro) {
409404
from buildServerNoticeTaskProvider
410405
} else {
411-
if (jdk) {
412-
from buildDefaultNoticeTaskProvider
413-
} else {
414-
from buildDefaultNoJdkNoticeTaskProvider
415-
}
406+
from buildDefaultNoticeTaskProvider
416407
}
417408
}
418409
}
@@ -466,14 +457,14 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
466457
* </dl>
467458
*/
468459
subprojects {
469-
ext.expansionsForDistribution = { distributionType, testDistro, jdk ->
460+
ext.expansionsForDistribution = { distributionType, isTestDistro ->
470461
final String packagingPathData = "path.data: /var/lib/elasticsearch"
471462
final String pathLogs = "/var/log/elasticsearch"
472463
final String packagingPathLogs = "path.logs: ${pathLogs}"
473464
final String packagingLoggc = "${pathLogs}/gc.log"
474465

475466
String licenseText
476-
if (testDistro) {
467+
if (isTestDistro) {
477468
licenseText = rootProject.file('licenses/SSPL-1.0+ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
478469
} else {
479470
licenseText = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
@@ -541,7 +532,7 @@ subprojects {
541532
],
542533

543534
'es.distribution.flavor': [
544-
'def': testDistro ? 'oss' : 'default'
535+
'def': 'default'
545536
],
546537

547538
'es.distribution.type': [
@@ -552,11 +543,11 @@ subprojects {
552543
],
553544

554545
'es.bundled_jdk': [
555-
'def': jdk ? 'true' : 'false'
546+
'def': 'true'
556547
],
557548

558549
'license.name': [
559-
'deb': testDistro ? 'ASL-2.0' : 'Elastic-License'
550+
'deb': 'Elastic-License'
560551
],
561552

562553
'license.text': [

0 commit comments

Comments
 (0)