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/dovetail | |
| 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/dovetail')
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-project-jobs.yml | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 0c7dbe33a..6f3ed128b 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -202,10 +202,7 @@ description: "Directory where the dovetail repository is cloned" scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{dovetail-branch}' + - git-scm builders: - description-setter: diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml index 07106f609..826684919 100644 --- a/jjb/dovetail/dovetail-project-jobs.yml +++ b/jjb/dovetail/dovetail-project-jobs.yml @@ -33,10 +33,7 @@ - 'opnfv-build-ubuntu-defaults' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: @@ -73,10 +70,7 @@ - 'opnfv-build-ubuntu-defaults' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - gerrit: |