diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-12-12 07:22:19 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-12-19 00:06:06 +0000 |
| commit | b2bc05dad00f551cdcaa10c4f3864adc67639dbf (patch) | |
| tree | 57fc065f79968b7128f978db2e7d6e83d4be8a2e /jjb/kvmfornfv | |
| parent | f012d1984209359034c326227b9c6a6b31eeb060 (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/kvmfornfv')
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 1c2bf5053..a708c8af2 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -117,15 +117,10 @@ concurrent: true scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - ssh-agent-wrapper - timeout: timeout: 360 fail: true @@ -158,10 +153,7 @@ gs-pathname: '{gs-pathname}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - gerrit: @@ -200,10 +192,7 @@ gs-pathname: '{gs-pathname}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - timed: '@midnight' @@ -240,15 +229,10 @@ concurrent: false scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - ssh-agent-wrapper - timeout: timeout: 360 fail: true |