diff --git a/Jenkinsfile b/Jenkinsfile index 23fee205c342e9e7f78d969c673b0047416c0ecc..23aa689bb7218b8abc18fc9fc078b6c60eb8f684 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { def parentPom = readMavenPom file: 'ozgcloud-common-parent/pom.xml' def parentVersion = parentPom.version - if(env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4'){ + if(env.BRANCH_NAME == 'release'){ if ( !(rootVersion ==~ RELEASE_REGEX) || !(dependenciesVersion ==~ RELEASE_REGEX) || !(parentVersion ==~ RELEASE_REGEX)) { error("Keine Release Version für Branch ${env.BRANCH_NAME}.") } @@ -95,8 +95,6 @@ pipeline { anyOf { branch 'master' branch 'release' - branch 'Version-4' - branch 'release-v4' } } steps { @@ -112,7 +110,7 @@ pipeline { post { failure { script { - if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4') { + if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release') { sendFailureMessage() } } @@ -130,7 +128,7 @@ Void sendFailureMessage() { if (env.BRANCH_NAME == 'master') { room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de" } - else if (env.BRANCH_NAME == 'release' || env.BRANCH_NAME == 'release-v4') { + else if (env.BRANCH_NAME == 'release') { room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de" }