summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-03-08 10:47:51 -0700
committerThanh Ha <thanh.ha@linuxfoundation.org>2016-03-08 18:03:35 +0000
commiteeea06eb5c693e1c03c72e69a67bb78550cb38a4 (patch)
tree9d1051b4bce7ecd3a7ba76a8d6f286d83b761fa1
parent8b5d7ecce53e830435159691ef5550af2e23c97d (diff)
Fix merge/integration jobs to build master, not gerrit
Change-Id: I72afb24d177b3b81e9427d43c3adb4a0a80fd240 Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r--jjb/honeycomb/honeycomb.yaml6
1 files 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
-
-