Skip to content
Snippets Groups Projects
Commit 207a2516 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6923 update imageTag/helmVersion in jenkinsfile

parent 488f6da2
No related branches found
No related tags found
No related merge requests found
...@@ -329,7 +329,7 @@ Void deployHelmChart(String helmChartVersion, String app ) { ...@@ -329,7 +329,7 @@ Void deployHelmChart(String helmChartVersion, String app ) {
} }
} }
def validateBranchName(branchName) { String validateBranchName(branchName) {
int maxLength = 30 int maxLength = 30
if (branchName.length() > maxLength) { if (branchName.length() > maxLength) {
String originalBranchName = branchName String originalBranchName = branchName
...@@ -343,13 +343,13 @@ def validateBranchName(branchName) { ...@@ -343,13 +343,13 @@ def validateBranchName(branchName) {
String buildVersionName() { String buildVersionName() {
if (isReleaseBranch()) { if (isReleaseBranch()) {
return getRootPomVersion(pomFile) return getRootPomVersion()
} }
if (isBarrierefreiheitBranch()) { 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){ Void tagAndPushDockerImage(String newTag){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment