Skip to content
Snippets Groups Projects
Commit 5811a366 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6923 add commitId to feature branch image tag/helm version

parent 63efc2da
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,7 @@ tools { go 'go-1.22.0' } ...@@ -89,7 +89,7 @@ tools { go 'go-1.22.0' }
sh "docker build -t docker.ozg-sh.de/info-manager-proxy:${env.APP_VERSION} ." sh "docker build -t docker.ozg-sh.de/info-manager-proxy:${env.APP_VERSION} ."
IMAGE_TAG = generateImageTag() IMAGE_TAG = buildVersionName()
tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG) tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG)
...@@ -107,7 +107,7 @@ tools { go 'go-1.22.0' } ...@@ -107,7 +107,7 @@ tools { go 'go-1.22.0' }
steps { steps {
script { script {
FAILED_STAGE=env.STAGE_NAME FAILED_STAGE=env.STAGE_NAME
HELM_CHART_VERSION = generateHelmChartVersion() HELM_CHART_VERSION = buildVersionName()
sh "./run_helm_test.sh" sh "./run_helm_test.sh"
...@@ -177,8 +177,22 @@ String getHelmRepository(){ ...@@ -177,8 +177,22 @@ String getHelmRepository(){
return 'ozg-base-apps-snapshot'; return 'ozg-base-apps-snapshot';
} }
String generateImageTag() { String validateBranchName(branchName) {
return "${env.APP_VERSION}-${env.BRANCH_NAME}" int maxLength = 30
if (branchName.length() > maxLength) {
String originalBranchName = branchName
branchName = branchName.substring(0, maxLength)
echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
"It has been truncated to '${branchName}' for deployment purposes."
}
return branchName
}
String buildVersionName() {
if (isReleaseBranch()) {
return env.APP_VERSION
}
return "${env.APP_VERSION}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
} }
...@@ -297,18 +311,6 @@ Boolean isReleaseBranch() { ...@@ -297,18 +311,6 @@ Boolean isReleaseBranch() {
return env.BRANCH_NAME == 'release' return env.BRANCH_NAME == 'release'
} }
String generateHelmChartVersion() {
def chartVersion = "${env.APP_VERSION}"
if (isMasterBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}"
}
else if (!isReleaseBranch()) {
chartVersion += "-${env.BRANCH_NAME}"
}
return chartVersion.replaceAll("_", "-")
}
Void tagAndPushDockerImage(String imageName, String newTag){ Void tagAndPushDockerImage(String imageName, String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment