Add no-jdk distributions (#39882)

This commit adds a variant for every official distribution that omits
the bundled jdk. The "no-jdk" naming is conveyed through the package
classifier, alongside the platform. Package tests are also added for
each new distribution.

TESTING.asciidoc

@@ -504,8 +504,8 @@ sudo bash $PACKAGING_TESTS/run-tests.sh
 
 # run specific test cases
 sudo bash $PACKAGING_TESTS/run-tests.sh \
-  org.elasticsearch.packaging.test.DefaultZipTests \
-  org.elasticsearch.packaging.test.OssZipTests
+  org.elasticsearch.packaging.test.DefaultWindowsZipTests \
+  org.elasticsearch.packaging.test.OssWindowsZipTests
 --------------------------------------------
 
 or on Windows, from a terminal running as Administrator
@@ -516,8 +516,8 @@ powershell -File $Env:PACKAGING_TESTS/run-tests.ps1
 
 # run specific test cases
 powershell -File $Env:PACKAGING_TESTS/run-tests.ps1 `
-  org.elasticsearch.packaging.test.DefaultZipTests `
-  org.elasticsearch.packaging.test.OssZipTests
+  org.elasticsearch.packaging.test.DefaultWindowsZipTests `
+  org.elasticsearch.packaging.test.OssWindowsZipTests
 --------------------------------------------
 
 Note that on Windows boxes when running from inside the GUI, you may have to log out and

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -60,7 +60,15 @@ class VagrantTestPlugin implements Plugin<Project> {
             'packages:rpm',
             'packages:oss-rpm',
             'packages:deb',
-            'packages:oss-deb'
+            'packages:oss-deb',
+            'archives:no-jdk-linux-tar',
+            'archives:oss-no-jdk-linux-tar',
+            'archives:no-jdk-windows-zip',
+            'archives:oss-no-jdk-windows-zip',
+            'packages:no-jdk-rpm',
+            'packages:oss-no-jdk-rpm',
+            'packages:no-jdk-deb',
+            'packages:oss-no-jdk-deb'
     ])
 
     /** Packages onboarded for upgrade tests **/

distribution/archives/build.gradle

@@ -45,7 +45,7 @@ task createPluginsDir(type: EmptyDirTask) {
   dirMode 0755
 }
 
-CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String platform, boolean oss) {
+CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String platform, boolean oss, boolean jdk) {
   return copySpec {
     into("elasticsearch-${version}") {
       into('lib') {
@@ -59,7 +59,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
       into('bin') {
         with binFiles(distributionType, oss)
       }
-      if (platform != null) {
+      if (jdk) {
         into('jdk') {
           with jdkFiles(platform)
         }
@@ -107,19 +107,31 @@ Closure commonZipConfig = {
 
 task buildIntegTestZip(type: Zip) {
   configure(commonZipConfig)
-  with archiveFiles(transportModulesFiles, 'zip', null, true)
+  with archiveFiles(transportModulesFiles, 'zip', null, true, false)
 }
 
 task buildWindowsZip(type: Zip) {
   configure(commonZipConfig)
   archiveClassifier = 'windows-x86_64'
-  with archiveFiles(modulesFiles(false), 'zip', 'windows', false)
+  with archiveFiles(modulesFiles(false), 'zip', 'windows', false, true)
 }
 
 task buildOssWindowsZip(type: Zip) {
   configure(commonZipConfig)
   archiveClassifier = 'windows-x86_64'
-  with archiveFiles(modulesFiles(true), 'zip', 'windows', true)
+  with archiveFiles(modulesFiles(true), 'zip', 'windows', true, true)
+}
+
+task buildNoJdkWindowsZip(type: Zip) {
+  configure(commonZipConfig)
+  archiveClassifier = 'no-jdk-windows-x86_64'
+  with archiveFiles(modulesFiles(false), 'zip', 'windows', false, false)
+}
+
+task buildOssNoJdkWindowsZip(type: Zip) {
+  configure(commonZipConfig)
+  archiveClassifier = 'no-jdk-windows-x86_64'
+  with archiveFiles(modulesFiles(true), 'zip', 'windows', true, false)
 }
 
 Closure commonTarConfig = {
@@ -132,25 +144,49 @@ Closure commonTarConfig = {
 task buildDarwinTar(type: Tar) {
   configure(commonTarConfig)
   archiveClassifier = 'darwin-x86_64'
-  with archiveFiles(modulesFiles(false), 'tar', 'darwin', false)
+  with archiveFiles(modulesFiles(false), 'tar', 'darwin', false, true)
 }
 
 task buildOssDarwinTar(type: Tar) {
   configure(commonTarConfig)
   archiveClassifier = 'darwin-x86_64'
-  with archiveFiles(modulesFiles(true), 'tar', 'darwin', true)
+  with archiveFiles(modulesFiles(true), 'tar', 'darwin', true, true)
+}
+
+task buildNoJdkDarwinTar(type: Tar) {
+  configure(commonTarConfig)
+  archiveClassifier = 'no-jdk-darwin-x86_64'
+  with archiveFiles(modulesFiles(false), 'tar', 'darwin', false, false)
+}
+
+task buildOssNoJdkDarwinTar(type: Tar) {
+  configure(commonTarConfig)
+  archiveClassifier = 'no-jdk-darwin-x86_64'
+  with archiveFiles(modulesFiles(true), 'tar', 'darwin', true, false)
 }
 
 task buildLinuxTar(type: Tar) {
   configure(commonTarConfig)
   archiveClassifier = 'linux-x86_64'
-  with archiveFiles(modulesFiles(false), 'tar', 'linux', false)
+  with archiveFiles(modulesFiles(false), 'tar', 'linux', false, true)
 }
 
 task buildOssLinuxTar(type: Tar) {
   configure(commonTarConfig)
   archiveClassifier = 'linux-x86_64'
-  with archiveFiles(modulesFiles(true), 'tar', 'linux', true)
+  with archiveFiles(modulesFiles(true), 'tar', 'linux', true, true)
+}
+
+task buildNoJdkLinuxTar(type: Tar) {
+  configure(commonTarConfig)
+  archiveClassifier = 'no-jdk-linux-x86_64'
+  with archiveFiles(modulesFiles(false), 'tar', 'linux', false, false)
+}
+
+task buildOssNoJdkLinuxTar(type: Tar) {
+  configure(commonTarConfig)
+  archiveClassifier = 'no-jdk-linux-x86_64'
+  with archiveFiles(modulesFiles(true), 'tar', 'linux', true, false)
 }
 
 Closure tarExists = { it -> new File('/bin/tar').exists() || new File('/usr/bin/tar').exists() || new File('/usr/local/bin/tar').exists() }

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

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

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

distribution/packages/build.gradle

@@ -64,7 +64,8 @@ buildscript {
 void addProcessFilesTask(String type, boolean oss) {
   String packagingFiles = "build/packaging/${ oss ? 'oss-' : ''}${type}"
 
-  task("process${oss ? 'Oss' : ''}${type.capitalize()}Files", type: Copy) {
+  String taskName = "process${oss ? 'Oss' : ''}${type.capitalize()}Files"
+  task(taskName, type: Copy) {
     into packagingFiles
 
     with copySpec {
@@ -98,17 +99,18 @@ addProcessFilesTask('rpm', false)
 // Common configuration that is package dependent. This can't go in ospackage
 // since we have different templated files that need to be consumed, but the structure
 // is the same
-Closure commonPackageConfig(String type, boolean oss) {
+Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
   return {
     dependsOn "process${oss ? 'Oss' : ''}${type.capitalize()}Files"
     packageName "elasticsearch${oss ? '-oss' : ''}"
     arch (type == 'deb' ? 'amd64' : 'X86_64')
     // Follow elasticsearch's file naming convention
-    archiveName "${packageName}-${project.version}-${archString}.${type}"
+    String jdkString = jdk ? "" : "no-jdk-"
+    archiveName "${packageName}-${project.version}-${jdkString}${archString}.${type}"
 
-    String prefix = "${oss ? 'oss-' : ''}${type}"
+    String prefix = "${oss ? 'oss-' : ''}${jdk ? '' : 'no-jdk-'}${type}"
     destinationDir = file("${prefix}/build/distributions")
-    String packagingFiles = "build/packaging/${prefix}"
+    String packagingFiles = "build/packaging/${oss ? 'oss-' : ''}${type}"
 
     String scripts = "${packagingFiles}/scripts"
     preInstall file("${scripts}/preinst")
@@ -135,8 +137,10 @@ Closure commonPackageConfig(String type, boolean oss) {
       into('modules') {
         with modulesFiles(oss)
       }
-      into('jdk') {
-        with jdkFiles('linux')
+      if (jdk) {
+        into('jdk') {
+          with jdkFiles('linux')
+        }
       }
       // we need to specify every intermediate directory in these paths so the package managers know they are explicitly
       // intended to manage them; otherwise they may be left behind on uninstallation. duplicate calls of the same
@@ -289,9 +293,9 @@ ospackage {
   with noticeFile
 }
 
-Closure commonDebConfig(boolean oss) {
+Closure commonDebConfig(boolean oss, boolean jdk) {
   return {
-    configure(commonPackageConfig('deb', oss))
+    configure(commonPackageConfig('deb', oss, jdk))
 
     // jdeb does not provide a way to set the License control attribute, and ospackage
     // silently ignores setting it. Instead, we set the license as "custom field"
@@ -314,16 +318,24 @@ Closure commonDebConfig(boolean oss) {
 }
 
 task buildDeb(type: Deb) {
-  configure(commonDebConfig(false))
+  configure(commonDebConfig(false, true))
 }
 
 task buildOssDeb(type: Deb) {
-  configure(commonDebConfig(true))
+  configure(commonDebConfig(true, true))
+}
+
+task buildNoJdkDeb(type: Deb) {
+  configure(commonDebConfig(false, false))
+}
+
+task buildOssNoJdkDeb(type: Deb) {
+  configure(commonDebConfig(true, false))
 }
 
-Closure commonRpmConfig(boolean oss) {
+Closure commonRpmConfig(boolean oss, boolean jdk) {
   return {
-    configure(commonPackageConfig('rpm', oss))
+    configure(commonPackageConfig('rpm', oss, jdk))
 
     if (oss) {
       license 'ASL 2.0'
@@ -351,11 +363,19 @@ Closure commonRpmConfig(boolean oss) {
 }
 
 task buildRpm(type: Rpm) {
-  configure(commonRpmConfig(false))
+  configure(commonRpmConfig(false, true))
 }
 
 task buildOssRpm(type: Rpm) {
-  configure(commonRpmConfig(true))
+  configure(commonRpmConfig(true, true))
+}
+
+task buildNoJdkRpm(type: Rpm) {
+  configure(commonRpmConfig(false, false))
+}
+
+task buildOssNoJdkRpm(type: Rpm) {
+  configure(commonRpmConfig(true, false))
 }
 
 Closure dpkgExists = { it -> new File('/bin/dpkg-deb').exists() || new File('/usr/bin/dpkg-deb').exists() || new File('/usr/local/bin/dpkg-deb').exists() }

distribution/packages/no-jdk-deb/build.gradle

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

distribution/packages/no-jdk-rpm/build.gradle

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

distribution/packages/oss-no-jdk-deb/build.gradle

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

distribution/packages/oss-no-jdk-rpm/build.gradle

@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.

plugins/examples/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java

@@ -19,11 +19,6 @@
 
 package org.elasticsearch.example.expertscript;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Collection;
-import java.util.Map;
-
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.PostingsEnum;
 import org.apache.lucene.index.Term;
@@ -36,6 +31,11 @@
 import org.elasticsearch.script.ScriptEngine;
 import org.elasticsearch.search.lookup.SearchLookup;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Collection;
+import java.util.Map;
+
 /**
  * An example script plugin that adds a {@link ScriptEngine} implementing expert scoring.
  */

qa/vagrant/src/main/java/org/elasticsearch/packaging/PackagingTests.java

@@ -21,28 +21,36 @@
 
 import org.elasticsearch.packaging.test.DefaultDebBasicTests;
 import org.elasticsearch.packaging.test.DefaultDebPreservationTests;
+import org.elasticsearch.packaging.test.DefaultLinuxTarTests;
+import org.elasticsearch.packaging.test.DefaultNoJdkDebBasicTests;
+import org.elasticsearch.packaging.test.DefaultNoJdkLinuxTarTests;
+import org.elasticsearch.packaging.test.DefaultNoJdkRpmBasicTests;
+import org.elasticsearch.packaging.test.DefaultNoJdkWindowsZipTests;
 import org.elasticsearch.packaging.test.DefaultRpmBasicTests;
 import org.elasticsearch.packaging.test.DefaultRpmPreservationTests;
-import org.elasticsearch.packaging.test.DefaultTarTests;
 import org.elasticsearch.packaging.test.DefaultWindowsServiceTests;
-import org.elasticsearch.packaging.test.DefaultZipTests;
+import org.elasticsearch.packaging.test.DefaultWindowsZipTests;
 import org.elasticsearch.packaging.test.OssDebBasicTests;
 import org.elasticsearch.packaging.test.OssDebPreservationTests;
+import org.elasticsearch.packaging.test.OssLinuxTarTests;
+import org.elasticsearch.packaging.test.OssNoJdkDebBasicTests;
+import org.elasticsearch.packaging.test.OssNoJdkLinuxTarTests;
+import org.elasticsearch.packaging.test.OssNoJdkRpmBasicTests;
+import org.elasticsearch.packaging.test.OssNoJdkWindowsZipTests;
 import org.elasticsearch.packaging.test.OssRpmBasicTests;
 import org.elasticsearch.packaging.test.OssRpmPreservationTests;
-import org.elasticsearch.packaging.test.OssTarTests;
 import org.elasticsearch.packaging.test.OssWindowsServiceTests;
-import org.elasticsearch.packaging.test.OssZipTests;
+import org.elasticsearch.packaging.test.OssWindowsZipTests;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
 @SuiteClasses({
-    DefaultTarTests.class,
-    OssTarTests.class,
-    DefaultZipTests.class,
-    OssZipTests.class,
+    DefaultLinuxTarTests.class,
+    OssLinuxTarTests.class,
+    DefaultWindowsZipTests.class,
+    OssWindowsZipTests.class,
     DefaultRpmBasicTests.class,
     OssRpmBasicTests.class,
     DefaultDebBasicTests.class,
@@ -52,6 +60,14 @@
     DefaultRpmPreservationTests.class,
     OssRpmPreservationTests.class,
     DefaultWindowsServiceTests.class,
-    OssWindowsServiceTests.class
+    OssWindowsServiceTests.class,
+    DefaultNoJdkLinuxTarTests.class,
+    OssNoJdkLinuxTarTests.class,
+    DefaultNoJdkWindowsZipTests.class,
+    OssNoJdkWindowsZipTests.class,
+    DefaultNoJdkRpmBasicTests.class,
+    OssNoJdkRpmBasicTests.class,
+    DefaultNoJdkDebBasicTests.class,
+    OssNoJdkDebBasicTests.class
 })
 public class PackagingTests {}