diff --git a/Jenkinsfile b/Jenkinsfile index b95ab3ce633079955d9afec6d65d5318f88b2369..dcb6b22ae92e04057b2d6758ac7a578fe649a101 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -329,7 +329,7 @@ Void deployHelmChart(String helmChartVersion, String app ) { } } -def validateBranchName(branchName) { +String validateBranchName(branchName) { int maxLength = 30 if (branchName.length() > maxLength) { String originalBranchName = branchName @@ -343,13 +343,13 @@ def validateBranchName(branchName) { String buildVersionName() { if (isReleaseBranch()) { - return getRootPomVersion(pomFile) + return getRootPomVersion() } if (isBarrierefreiheitBranch()) { - return "${getRootPomVersion(pomFile)}-barrierefreiheit${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-") + return "${getRootPomVersion()}-barrierefreiheit${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-") } - return "${getRootPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-") + return "${getRootPomVersion()}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-") } Void tagAndPushDockerImage(String newTag){