diff --git a/Jenkinsfile b/Jenkinsfile index f23a10ac8681f6a6171b2d390ad8090bfba77bbf..90e402d1e0d747b339687dbf13dfbe15c56b26f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } environment { - BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/token-checker/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" + JENKINS_URL = "https://jenkins.infra.ozg-cloud.systems/job/codeSH_token-checker/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" RELEASE_REGEX = /\d+.\d+.\d+/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ FAILED_STAGE = "" @@ -42,7 +42,7 @@ pipeline { when { not { anyOf { - branch 'master' + branch 'main' branch 'release' } } @@ -104,7 +104,7 @@ pipeline { tagAndPushDockerImage(IMAGE_TAG) - if (env.BRANCH_NAME == 'master') { + if (isMainBranch()) { tagAndPushDockerImage('snapshot-latest') } @@ -137,7 +137,7 @@ pipeline { stage('Trigger Dev rollout') { when { - branch 'master' + branch 'main' } steps { script { @@ -190,7 +190,7 @@ pipeline { stage('Sonar Checks') { when { - branch 'master' + branch 'main' } steps { script { @@ -218,7 +218,7 @@ pipeline { } failure { script { - if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release') { + if (isMainBranch() || env.BRANCH_NAME == 'release') { sendFailureMessage() } } @@ -245,9 +245,9 @@ Void configureGit() { Void sendFailureMessage() { def room = '' def data = """{"msgtype":"m.text", \ - "body":"MUK-Postfach: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \ + "body":"Token Checker: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${JENKINS_URL}", \ "format": "org.matrix.custom.html", \ - "formatted_body":"MUK-Postfach: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}""" + "formatted_body":"Token Checker: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${JENKINS_URL}'>${env.BUILD_NUMBER}</a>"}""" if (env.BRANCH_NAME == 'main') { room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de" @@ -370,3 +370,7 @@ Void pushNewGitopsVersion(String environment) { Boolean hasTokenCheckerValuesFileChanged(String environment) { return sh (script: "git status | grep '${environment}/application/values/token-checker-server-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer } + +Boolean isMainBranch() { + return env.BRANCH_NAME == 'main' +}