Use new wireCompatVersions property instead of bwcVersion (elastic/x-pack-elasticsearch#1466)
This is the xpack side of elastic/elasticsearch#24748 Original commit: elastic/x-pack-elasticsearch@8b7dd5cdbe
This commit is contained in:
Ryan Ernst
GitHub
parent
05daaa8a3c
commit
573da95e26
|
|
@ -45,6 +45,6 @@ subprojects {
|
|||
}
|
||||
ext.projectSubstitutions += [
|
||||
"org.elasticsearch.plugin:x-pack-api:${version}": ':x-pack-elasticsearch:plugin',
|
||||
"org.elasticsearch.plugin:x-pack:${bwcVersion}": ':x-pack-elasticsearch:plugin:bwc-zip'
|
||||
"org.elasticsearch.plugin:x-pack:${wireCompatVersions[-1]}": ':x-pack-elasticsearch:plugin:bwc-zip'
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,114 +3,119 @@ import org.elasticsearch.gradle.LoggedExec
|
|||
|
||||
/**
|
||||
* This is a dummy project which does a local checkout of the previous
|
||||
* major version's stable branch, and builds a snapshot. This allows backcompat
|
||||
* tests in the next major version to test against the next unreleased minor
|
||||
* version, without relying on snapshots.
|
||||
* wire compat version's branch, and builds a snapshot. This allows backcompat
|
||||
* tests to test against the next unreleased version, closest to this version,
|
||||
* without relying on snapshots.
|
||||
*/
|
||||
|
||||
apply plugin: 'distribution'
|
||||
String bwcVersion = wireCompatVersions[-1]
|
||||
if (bwcVersion.endsWith('-SNAPSHOT')) {
|
||||
apply plugin: 'distribution'
|
||||
|
||||
File esCheckoutDir = file("${buildDir}/bwc/checkout-es-5.x")
|
||||
File xpackCheckoutDir = file("${esCheckoutDir}-extra/x-pack-elasticsearch")
|
||||
task createElasticsearchClone(type: LoggedExec) {
|
||||
onlyIf { esCheckoutDir.exists() == false }
|
||||
commandLine = ['git', 'clone', rootDir, esCheckoutDir]
|
||||
}
|
||||
def (String major, String minor, String bugfix) = bwcVersion.split('\\.')
|
||||
String bwcBranch = bugfix == '0-SNAPSHOT' ? "${major}.x" : "${major}.${minor}"
|
||||
|
||||
task createXPackClone(type: LoggedExec) {
|
||||
onlyIf { xpackCheckoutDir.exists() == false }
|
||||
commandLine = ['git', 'clone', project(':x-pack-elasticsearch').projectDir, xpackCheckoutDir]
|
||||
}
|
||||
File esCheckoutDir = file("${buildDir}/bwc/checkout-es-${bwcBranch}")
|
||||
File xpackCheckoutDir = file("${esCheckoutDir}-extra/x-pack-elasticsearch")
|
||||
task createElasticsearchClone(type: LoggedExec) {
|
||||
onlyIf { esCheckoutDir.exists() == false }
|
||||
commandLine = ['git', 'clone', rootDir, esCheckoutDir]
|
||||
}
|
||||
|
||||
// we use regular Exec here to ensure we always get output, regardless of logging level
|
||||
task findElasticsearchUpstream(type: Exec) {
|
||||
dependsOn createElasticsearchClone
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'remote', '-v']
|
||||
ignoreExitValue = true
|
||||
ByteArrayOutputStream output = new ByteArrayOutputStream()
|
||||
standardOutput = output
|
||||
doLast {
|
||||
if (execResult.exitValue != 0) {
|
||||
output.toString('UTF-8').eachLine { line -> logger.error(line) }
|
||||
execResult.assertNormalExitValue()
|
||||
}
|
||||
project.ext.esUpstreamExists = false
|
||||
output.toString('UTF-8').eachLine {
|
||||
if (it.contains("upstream")) {
|
||||
project.ext.esUpstreamExists = true
|
||||
task createXPackClone(type: LoggedExec) {
|
||||
onlyIf { xpackCheckoutDir.exists() == false }
|
||||
commandLine = ['git', 'clone', project(':x-pack-elasticsearch').projectDir, xpackCheckoutDir]
|
||||
}
|
||||
|
||||
// we use regular Exec here to ensure we always get output, regardless of logging level
|
||||
task findElasticsearchUpstream(type: Exec) {
|
||||
dependsOn createElasticsearchClone
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'remote', '-v']
|
||||
ignoreExitValue = true
|
||||
ByteArrayOutputStream output = new ByteArrayOutputStream()
|
||||
standardOutput = output
|
||||
doLast {
|
||||
if (execResult.exitValue != 0) {
|
||||
output.toString('UTF-8').eachLine { line -> logger.error(line) }
|
||||
execResult.assertNormalExitValue()
|
||||
}
|
||||
project.ext.esUpstreamExists = false
|
||||
output.toString('UTF-8').eachLine {
|
||||
if (it.contains("upstream")) {
|
||||
project.ext.esUpstreamExists = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task findXPackUpstream(type: Exec) {
|
||||
dependsOn createXPackClone
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'remote', '-v']
|
||||
ignoreExitValue = true
|
||||
ByteArrayOutputStream output = new ByteArrayOutputStream()
|
||||
standardOutput = output
|
||||
doLast {
|
||||
if (execResult.exitValue != 0) {
|
||||
output.toString('UTF-8').eachLine { line -> logger.error(line) }
|
||||
execResult.assertNormalExitValue()
|
||||
}
|
||||
project.ext.xpackUpstreamExists = false
|
||||
output.toString('UTF-8').eachLine {
|
||||
if (it.contains("upstream")) {
|
||||
project.ext.xpackUpstreamExists = true
|
||||
task findXPackUpstream(type: Exec) {
|
||||
dependsOn createXPackClone
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'remote', '-v']
|
||||
ignoreExitValue = true
|
||||
ByteArrayOutputStream output = new ByteArrayOutputStream()
|
||||
standardOutput = output
|
||||
doLast {
|
||||
if (execResult.exitValue != 0) {
|
||||
output.toString('UTF-8').eachLine { line -> logger.error(line) }
|
||||
execResult.assertNormalExitValue()
|
||||
}
|
||||
project.ext.xpackUpstreamExists = false
|
||||
output.toString('UTF-8').eachLine {
|
||||
if (it.contains("upstream")) {
|
||||
project.ext.xpackUpstreamExists = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task addElasticsearchUpstream(type: LoggedExec) {
|
||||
dependsOn findElasticsearchUpstream
|
||||
onlyIf { project.ext.esUpstreamExists == false }
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'remote', 'add', 'upstream', 'git@github.com:elastic/elasticsearch.git']
|
||||
}
|
||||
task addElasticsearchUpstream(type: LoggedExec) {
|
||||
dependsOn findElasticsearchUpstream
|
||||
onlyIf { project.ext.esUpstreamExists == false }
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'remote', 'add', 'upstream', 'git@github.com:elastic/elasticsearch.git']
|
||||
}
|
||||
|
||||
task addXPackUpstream(type: LoggedExec) {
|
||||
dependsOn findXPackUpstream
|
||||
onlyIf { project.ext.xpackUpstreamExists == false }
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'remote', 'add', 'upstream', 'git@github.com:elastic/x-pack-elasticsearch.git']
|
||||
}
|
||||
task addXPackUpstream(type: LoggedExec) {
|
||||
dependsOn findXPackUpstream
|
||||
onlyIf { project.ext.xpackUpstreamExists == false }
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'remote', 'add', 'upstream', 'git@github.com:elastic/x-pack-elasticsearch.git']
|
||||
}
|
||||
|
||||
task fetchElasticsearchLatest(type: LoggedExec) {
|
||||
dependsOn addElasticsearchUpstream
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'fetch', 'upstream']
|
||||
}
|
||||
task fetchElasticsearchLatest(type: LoggedExec) {
|
||||
dependsOn addElasticsearchUpstream
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'fetch', 'upstream']
|
||||
}
|
||||
|
||||
task fetchXPackLatest(type: LoggedExec) {
|
||||
dependsOn addXPackUpstream
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'fetch', 'upstream']
|
||||
}
|
||||
task fetchXPackLatest(type: LoggedExec) {
|
||||
dependsOn addXPackUpstream
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'fetch', 'upstream']
|
||||
}
|
||||
|
||||
task checkoutElasticsearchBwcBranch(type: LoggedExec) {
|
||||
dependsOn fetchElasticsearchLatest
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'checkout', 'upstream/5.x']
|
||||
}
|
||||
task checkoutElasticsearchBwcBranch(type: LoggedExec) {
|
||||
dependsOn fetchElasticsearchLatest
|
||||
workingDir = esCheckoutDir
|
||||
commandLine = ['git', 'checkout', "upstream/${bwcBranch}"]
|
||||
}
|
||||
|
||||
task checkoutXPackBwcBranch(type: LoggedExec) {
|
||||
dependsOn fetchXPackLatest
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'checkout', 'upstream/5.x']
|
||||
}
|
||||
task checkoutXPackBwcBranch(type: LoggedExec) {
|
||||
dependsOn fetchXPackLatest
|
||||
workingDir = xpackCheckoutDir
|
||||
commandLine = ['git', 'checkout', "upstream/${bwcBranch}"]
|
||||
}
|
||||
|
||||
File bwcZip = file("${xpackCheckoutDir}/plugin/build/distributions/x-pack-${bwcVersion}.zip")
|
||||
task buildBwcVersion(type: GradleBuild) {
|
||||
dependsOn checkoutXPackBwcBranch, checkoutElasticsearchBwcBranch
|
||||
dir = xpackCheckoutDir
|
||||
tasks = [':x-pack-elasticsearch:plugin:assemble']
|
||||
}
|
||||
File bwcZip = file("${xpackCheckoutDir}/plugin/build/distributions/x-pack-${bwcVersion}.zip")
|
||||
task buildBwcVersion(type: GradleBuild) {
|
||||
dependsOn checkoutXPackBwcBranch, checkoutElasticsearchBwcBranch
|
||||
dir = xpackCheckoutDir
|
||||
tasks = [':x-pack-elasticsearch:plugin:assemble']
|
||||
}
|
||||
|
||||
artifacts {
|
||||
'default' file: bwcZip, name: 'x-pack', type: 'zip', builtBy: buildBwcVersion
|
||||
artifacts {
|
||||
'default' file: bwcZip, name: 'x-pack', type: 'zip', builtBy: buildBwcVersion
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ task oldClusterTest(type: RestIntegTestTask) {
|
|||
oldClusterTestCluster {
|
||||
plugin ':x-pack-elasticsearch:plugin'
|
||||
distribution = 'zip'
|
||||
bwcVersion = project.bwcVersion // TODO: either randomize, or make this settable with sysprop
|
||||
bwcVersion = project.wireCompatVersions[-1] // TODO: either randomize, or make this settable with sysprop
|
||||
numBwcNodes = 2
|
||||
numNodes = 2
|
||||
clusterName = 'rolling-upgrade'
|
||||
|
|
|
|||
Loading…
Reference in New Issue