honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix branch logic for bwc tests in the same major version

Browse Source 
When testing against the previous 5.x release, the bwc project incorrectly would checkout the 5.x
branch instead of the 5.5 branch as it still had the logic that applies for major versions bwc. This change adds
a check to compare the major version when making the decision on the branch to use.

Original commit: elastic/x-pack-elasticsearch@b07aa78a7b
This commit is contained in:
jaymode 2017-06-08 11:40:45 -06:00
parent 64330ff14d
commit dad15b8d6c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/bwc/build.gradle
View File

@ -33,8 +33,15 @@ subprojects {
apply plugin: 'distribution'
def (String major, String minor, String bugfix) = bwcVersion.split('\\.')
String bwcBranch =
project.name == 'stable-snapshot' ? "${major}.x" : "${major}.${minor}"
def (String currentMajor, String currentMinor, String currentBugfix) = version.split('\\.')
String bwcBranch
if (project.name == 'bwc-stable-snapshot') {
bwcBranch = "${major}.x"
} else if (major != currentMajor) {
bwcBranch = "${major}.x"
} else {
bwcBranch = "${major}.${minor}"
}
File esCheckoutDir = file("${buildDir}/bwc/checkout-es-${bwcBranch}")
File xpackCheckoutDir = file("${esCheckoutDir}-extra/x-pack-elasticsearch")