From a953260ee838c5b1a824bfbd8f430d2688521f73 Mon Sep 17 00:00:00 2001
From: Taylor Dondich <taylor@dondich.com>
Date: Tue, 7 Feb 2017 08:37:46 -0800
Subject: [PATCH] Update Jenkinsfile to support bugfix branches and pull
 requests.

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b10158ce7..aa54badf8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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."
     }