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/compass4nfv | |
| 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/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 18 |
3 files changed, 7 insertions, 26 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 0d97fef75..e9d1f5302 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -197,10 +197,7 @@ - '{installer}-defaults' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm wrappers: - build-name: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 50ff072fb..ac132a577 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -45,10 +45,7 @@ - '{installer}-defaults' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm triggers: - timed: 'H 8 * * *' @@ -86,10 +83,7 @@ - '{node}-defaults' - '{installer}-defaults' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - shell: diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index 69cc958a8..3a11b1e0a 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -64,15 +64,10 @@ block-level: 'NODE' 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: 120 fail: true @@ -174,15 +169,10 @@ block-level: 'NODE' 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: 120 fail: true |