Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-3260

This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-05-22 12:11:46 -04:00

2
Jenkinsfile vendored
View File

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