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

OZG-6777 Anpassung Jenkinsfile an Branchumstellung

parent 10e0cbf6
No related branches found
No related tags found
No related merge requests found
...@@ -93,7 +93,7 @@ tools { go 'go-1.22.0' } ...@@ -93,7 +93,7 @@ tools { go 'go-1.22.0' }
tagAndPushDockerImage('antragsraum-proxy', IMAGE_TAG) tagAndPushDockerImage('antragsraum-proxy', IMAGE_TAG)
if (env.BRANCH_NAME == 'dev') { if (env.BRANCH_NAME == 'master') {
tagAndPushDockerImage('antragsraum-proxy', 'snapshot-latest') tagAndPushDockerImage('antragsraum-proxy', 'snapshot-latest')
} }
else if (env.BRANCH_NAME == 'release') { else if (env.BRANCH_NAME == 'release') {
...@@ -123,7 +123,7 @@ tools { go 'go-1.22.0' } ...@@ -123,7 +123,7 @@ tools { go 'go-1.22.0' }
stage('Trigger Dev rollout') { stage('Trigger Dev rollout') {
when { when {
branch 'dev' branch 'master'
} }
steps { steps {
script { script {
...@@ -184,8 +184,8 @@ String generateImageTag() { ...@@ -184,8 +184,8 @@ String generateImageTag() {
String getBuildProfile() { String getBuildProfile() {
if (isDevBranch()) { if (isMasterBranch()) {
return "-P dev" return "-P master"
} else if (isReleaseBranch()) { } else if (isReleaseBranch()) {
return "-P release" return "-P release"
} else { } else {
...@@ -289,8 +289,8 @@ Boolean hasAntragsraumProxyValuesFileChanged(String environment) { ...@@ -289,8 +289,8 @@ Boolean hasAntragsraumProxyValuesFileChanged(String environment) {
return sh (script: "git status | grep '${environment}/application/values/antragsraum-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer return sh (script: "git status | grep '${environment}/application/values/antragsraum-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
} }
Boolean isDevBranch() { Boolean isMasterBranch() {
return env.BRANCH_NAME == 'dev' return env.BRANCH_NAME == 'master'
} }
Boolean isReleaseBranch() { Boolean isReleaseBranch() {
...@@ -300,7 +300,7 @@ Boolean isReleaseBranch() { ...@@ -300,7 +300,7 @@ Boolean isReleaseBranch() {
String generateHelmChartVersion() { String generateHelmChartVersion() {
def chartVersion = "${env.APP_VERSION}" def chartVersion = "${env.APP_VERSION}"
if (isDevBranch()) { if (isMasterBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}" chartVersion += "-${env.GIT_COMMIT.take(7)}"
} }
else if (!isReleaseBranch()) { else if (!isReleaseBranch()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment