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

OZG-6923 update jenkinsfile for imagetag/helmVersion

parent 7e5c3693
No related branches found
No related tags found
No related merge requests found
......@@ -115,7 +115,7 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
IMAGE_TAG = generateHelmChartVersionAndImageTag('pom.xml')
IMAGE_TAG = buildVersionName('pom.xml')
tagAndPushDockerImage('vorgang-manager', IMAGE_TAG)
......@@ -134,9 +134,9 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
HELM_CHART_VERSION = generateHelmChartVersionAndImageTag("pom.xml").replaceAll("_", "-")
HELM_CHART_VERSION = buildVersionName("pom.xml")
if (env.BRANCH_NAME == 'release') {
HELM_CHART_VERSION = getPomVersion(pomFile).replaceAll("_", "-")
HELM_CHART_VERSION = getPomVersion(pomFile)
}
sh "./run_helm_test.sh"
......@@ -187,7 +187,7 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') {
steps {
script {
IMAGE_TAG = generateHelmChartVersionAndImageTag('pom.xml')
IMAGE_TAG = buildVersionName('pom.xml')
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
......@@ -272,8 +272,8 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
}
}
String generateHelmChartVersionAndImageTag(String pomFile) {
return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}"
String buildVersionName(String pomFile) {
return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
}
Void tagAndPushDockerImage(String imageName, String newTag){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment