Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2631

This commit is contained in:
Paula Quispe
2017-02-07 13:17:02 -04:00

3
Jenkinsfile vendored
View File

@@ -3,8 +3,7 @@ node {
/**
* Branch should be in gitflow format. If not, then we'll abort.
*/
if(!env.BRANCH_NAME.matches(/(feature|hotfix|release)\/.+/)) {
if(!env.BRANCH_NAME.matches(/(feature|hotfix|bugfix|release)\/.+/) && !test.matches(/^PR-.*$/)) {
hipchatSend message: "${env.BRANCH_NAME} Build: Does not match gitflow naming. Aborted", room: 'engineering'
error "Job does not follow gitflow naming format."
}