Remove unnecessary backport config since we don't backport TO master

This commit is contained in:
Mark Vieira 2021-10-26 17:07:29 -07:00
parent cadc0c3800
commit e82a70ca6c
2 changed files with 1 additions and 4 deletions

View File

@ -1,7 +1,6 @@
{
"upstream": "elastic/elasticsearch",
"targetBranchChoices": [
{ "name": "master", "checked": true },
"7.16",
"7.15",
"7.14",
@ -9,7 +8,6 @@
],
"targetPRLabels": ["backport"],
"branchLabelMapping": {
"^v8.0.0$": "master",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
}
}

View File

@ -103,8 +103,7 @@ tasks.register("verifyVersions") {
// Make sure backport bot config file is up to date
JsonNode backportConfig = new ObjectMapper().readTree(file(".backportrc.json"))
List<BwcVersions.UnreleasedVersionInfo> unreleased = BuildParams.bwcVersions.unreleased.collect { BuildParams.bwcVersions.unreleasedInfo(it) }
unreleased.each { unreleasedVersion ->
BuildParams.bwcVersions.forPreviousUnreleased { unreleasedVersion ->
boolean valid = backportConfig.get("targetBranchChoices").elements().any { branchChoice ->
if (branchChoice.isObject()) {
return branchChoice.get("name").textValue() == unreleasedVersion.branch