Adapt to compile and runtime Java home distinction
We now separate the compiler Java home from the time runtime Java home (the one that is used to compile class files versus the one that is used to run tests). This commit adapts x-pack-elasticsearch to this change. Relates elastic/x-pack-elasticsearch#3477 Original commit: elastic/x-pack-elasticsearch@bdb096e21c
This commit is contained in:
parent
368c4fff56
commit
8a0a14b9a3
|
@ -224,7 +224,7 @@ task createNodeKeyStore(type: LoggedExec) {
|
||||||
delete nodeKeystore
|
delete nodeKeystore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
||||||
args '-genkey',
|
args '-genkey',
|
||||||
'-alias', 'test-node',
|
'-alias', 'test-node',
|
||||||
|
|
|
@ -186,25 +186,31 @@ subprojects {
|
||||||
task buildBwcVersion(type: Exec) {
|
task buildBwcVersion(type: Exec) {
|
||||||
dependsOn checkoutXPackBwcBranch, checkoutElasticsearchBwcBranch, writeElasticsearchBuildMetadata, writeXPackBuildMetadata
|
dependsOn checkoutXPackBwcBranch, checkoutElasticsearchBwcBranch, writeElasticsearchBuildMetadata, writeXPackBuildMetadata
|
||||||
workingDir = xpackCheckoutDir
|
workingDir = xpackCheckoutDir
|
||||||
|
if (project.rootProject.ext.runtimeJavaVersion == JavaVersion.VERSION_1_8 && ["5.6", "6.0", "6.1"].contains(bwcBranch)) {
|
||||||
|
/*
|
||||||
|
* If runtime Java home is set to JDK 8 and we are building branches that are officially built with JDK 8, push this to JAVA_HOME for
|
||||||
|
* these builds.
|
||||||
|
*/
|
||||||
|
environment('JAVA_HOME', System.getenv('RUNTIME_JAVA_HOME'))
|
||||||
|
}
|
||||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||||
executable 'cmd'
|
executable 'cmd'
|
||||||
args '/C', 'call', new File(xpackCheckoutDir, 'gradlew').toString()
|
args '/C', 'call', new File(xpackCheckoutDir, 'gradlew').toString()
|
||||||
} else {
|
} else {
|
||||||
executable = new File(xpackCheckoutDir, 'gradlew').toString()
|
executable new File(xpackCheckoutDir, 'gradlew').toString()
|
||||||
}
|
}
|
||||||
final ArrayList<String> commandLineArgs = [":x-pack-elasticsearch:plugin:assemble", "-Dbuild.snapshot=${System.getProperty('build.snapshot') ?: 'true'}"]
|
args ":x-pack-elasticsearch:plugin:assemble", "-Dbuild.snapshot=${System.getProperty('build.snapshot') ?: 'true'}"
|
||||||
final LogLevel logLevel = gradle.startParameter.logLevel
|
final LogLevel logLevel = gradle.startParameter.logLevel
|
||||||
if ([LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG].contains(logLevel)) {
|
if ([LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG].contains(logLevel)) {
|
||||||
commandLineArgs << "--${logLevel.name().toLowerCase(Locale.ENGLISH)}"
|
args "--${logLevel.name().toLowerCase(Locale.ENGLISH)}"
|
||||||
}
|
}
|
||||||
final String showStacktraceName = gradle.startParameter.showStacktrace.name()
|
final String showStacktraceName = gradle.startParameter.showStacktrace.name()
|
||||||
assert ["INTERNAL_EXCEPTIONS", "ALWAYS", "ALWAYS_FULL"].contains(showStacktraceName)
|
assert ["INTERNAL_EXCEPTIONS", "ALWAYS", "ALWAYS_FULL"].contains(showStacktraceName)
|
||||||
if (showStacktraceName.equals("ALWAYS")) {
|
if (showStacktraceName.equals("ALWAYS")) {
|
||||||
commandLineArgs << "--stacktrace"
|
args "--stacktrace"
|
||||||
} else if (showStacktraceName.equals("ALWAYS_FULL")) {
|
} else if (showStacktraceName.equals("ALWAYS_FULL")) {
|
||||||
commandLineArgs << "--full-stacktrace"
|
args "--full-stacktrace"
|
||||||
}
|
}
|
||||||
args commandLineArgs
|
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
|
|
|
@ -42,7 +42,7 @@ task createNodeKeyStore(type: LoggedExec) {
|
||||||
delete nodeKeystore
|
delete nodeKeystore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
||||||
args '-genkey',
|
args '-genkey',
|
||||||
'-alias', 'test-node',
|
'-alias', 'test-node',
|
||||||
|
@ -67,7 +67,7 @@ task createClientKeyStore(type: LoggedExec) {
|
||||||
delete clientKeyStore
|
delete clientKeyStore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
standardInput = new ByteArrayInputStream('FirstName LastName\nUnit\nOrganization\nCity\nState\nNL\nyes\n\n'.getBytes('UTF-8'))
|
||||||
args '-genkey',
|
args '-genkey',
|
||||||
'-alias', 'test-client',
|
'-alias', 'test-client',
|
||||||
|
@ -92,7 +92,7 @@ task exportNodeCertificate(type: LoggedExec) {
|
||||||
delete nodeCertificate
|
delete nodeCertificate
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
args '-export',
|
args '-export',
|
||||||
'-alias', 'test-node',
|
'-alias', 'test-node',
|
||||||
'-keystore', nodeKeystore,
|
'-keystore', nodeKeystore,
|
||||||
|
@ -103,7 +103,7 @@ task exportNodeCertificate(type: LoggedExec) {
|
||||||
// Import the node certificate in the client's keystore
|
// Import the node certificate in the client's keystore
|
||||||
task importNodeCertificateInClientKeyStore(type: LoggedExec) {
|
task importNodeCertificateInClientKeyStore(type: LoggedExec) {
|
||||||
dependsOn exportNodeCertificate
|
dependsOn exportNodeCertificate
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
args '-import',
|
args '-import',
|
||||||
'-alias', 'test-node',
|
'-alias', 'test-node',
|
||||||
'-keystore', clientKeyStore,
|
'-keystore', clientKeyStore,
|
||||||
|
@ -123,7 +123,7 @@ task exportClientCertificate(type: LoggedExec) {
|
||||||
delete clientCertificate
|
delete clientCertificate
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
args '-export',
|
args '-export',
|
||||||
'-alias', 'test-client',
|
'-alias', 'test-client',
|
||||||
'-keystore', clientKeyStore,
|
'-keystore', clientKeyStore,
|
||||||
|
@ -134,7 +134,7 @@ task exportClientCertificate(type: LoggedExec) {
|
||||||
// Import the client certificate in the node's keystore
|
// Import the client certificate in the node's keystore
|
||||||
task importClientCertificateInNodeKeyStore(type: LoggedExec) {
|
task importClientCertificateInNodeKeyStore(type: LoggedExec) {
|
||||||
dependsOn exportClientCertificate
|
dependsOn exportClientCertificate
|
||||||
executable = new File(project.javaHome, 'bin/keytool')
|
executable = new File(project.runtimeJavaHome, 'bin/keytool')
|
||||||
args '-import',
|
args '-import',
|
||||||
'-alias', 'test-client',
|
'-alias', 'test-client',
|
||||||
'-keystore', nodeKeystore,
|
'-keystore', nodeKeystore,
|
||||||
|
|
Loading…
Reference in New Issue