From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 8 Mar 2016 17:47:51 +0000 (-0700)
Subject: Fix merge/integration jobs to build master, not gerrit
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=eeea06eb5c693e1c03c72e69a67bb78550cb38a4;p=ci-management.git

Fix merge/integration jobs to build master, not gerrit

Change-Id: I72afb24d177b3b81e9427d43c3adb4a0a80fd240
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

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
-
-