Skip to content
Snippets Groups Projects
Commit 84b79bf1 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4765 adjust naming

parent ce75566f
Branches
Tags 2.0.1
No related merge requests found
...@@ -261,7 +261,7 @@ String generateHelmChartVersion() { ...@@ -261,7 +261,7 @@ String generateHelmChartVersion() {
if (isMasterBranch()) { if (isMasterBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}" chartVersion += "-${env.GIT_COMMIT.take(7)}"
} }
else if (env.BRANCH_NAME != 'release') { else if (!isReleaseBranch()) {
chartVersion += "-${env.BRANCH_NAME}" chartVersion += "-${env.BRANCH_NAME}"
} }
...@@ -278,7 +278,7 @@ Void tagAndPushDockerImage(String newTag){ ...@@ -278,7 +278,7 @@ Void tagAndPushDockerImage(String newTag){
} }
String generateImageTag() { String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${VERSION}" def imageTag = "release-2.0.1";//"${env.BRANCH_NAME}-${VERSION}"
if (isMasterBranch()) { if (isMasterBranch()) {
imageTag += "-${env.GIT_COMMIT.take(7)}" imageTag += "-${env.GIT_COMMIT.take(7)}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment