Fix computation of the target branch on CI When computing the target branch on Gerrit CI, take into account the fix level included in the minor version (-NN-sha1) and set next version as 2.15. Change-Id: Iafb060900835ccc7a9bccff89681500b59686b04
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/GerritVersionBranch.java b/src/main/java/com/googlesource/gerrit/plugins/manager/GerritVersionBranch.java index faca388..467e3a3 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/GerritVersionBranch.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/GerritVersionBranch.java
@@ -15,7 +15,7 @@ package com.googlesource.gerrit.plugins.manager; public class GerritVersionBranch { - private static final String GERRIT_NEXT_VERSION = "2.13"; + private static final String GERRIT_NEXT_VERSION = "2.15"; public static String getBranch(String gerritVersion) { if (gerritVersion == null || gerritVersion.trim().isEmpty() @@ -24,6 +24,12 @@ return "master"; } String[] versionNumbers = gerritVersion.split("\\."); + String major = versionNumbers[0]; + String minor = versionNumbers[1]; + + if (minor.contains("-")) { + minor = minor.split("-")[0]; + } if (versionNumbers.length > 2) { String fixVersionNumber = versionNumbers[2]; @@ -36,6 +42,7 @@ } } } - return "stable-" + versionNumbers[0] + "." + versionNumbers[1]; + + return "stable-" + major + "." + minor; } }