summaryrefslogtreecommitdiffstats
path: root/jjb/multisite
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-12 07:22:19 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-19 00:06:06 +0000
commitb2bc05dad00f551cdcaa10c4f3864adc67639dbf (patch)
tree57fc065f79968b7128f978db2e7d6e83d4be8a2e /jjb/multisite
parentf012d1984209359034c326227b9c6a6b31eeb060 (diff)
clean scm defenitions
This patch makes sure we use 2 types of scm, and allows us to specify them by adding one line in job-templates. - git-scm # for daily jobs and merge jobs - git-scm-gerrit # for verify jobs [New] Change-Id: Iddc8a5e0e115193c7081a6d6c53da209900e95c8 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb/multisite')
-rw-r--r--jjb/multisite/multisite.yml15
1 files changed, 3 insertions, 12 deletions
diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index 8e542995e..cfe9b2d13 100644
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -39,10 +39,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
@@ -96,10 +93,7 @@
default: 'os-nosdn-multisite-ha'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- timed: '{timed}'
@@ -128,10 +122,7 @@
concurrent: false
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
builders:
- 'multisite-kingbird-deploy'