From eeea06eb5c693e1c03c72e69a67bb78550cb38a4 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 8 Mar 2016 10:47:51 -0700
Subject: [PATCH] Fix merge/integration jobs to build master, not gerrit

Change-Id: I72afb24d177b3b81e9427d43c3adb4a0a80fd240
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 jjb/honeycomb/honeycomb.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 4e3bb8280..0eb94c46f 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -123,10 +123,10 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout
@@ -157,5 +157,3 @@
             id: ''
             unique-version: true
             deploy-unstable: false
-
-
-- 
2.16.6