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/releng | |
| 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/releng')
| -rw-r--r-- | jjb/releng/artifact-cleanup.yml | 5 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docs.yml | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-lint.yml | 5 | ||||
| -rw-r--r-- | jjb/releng/releng-ci-jobs.yml | 15 |
5 files changed, 11 insertions, 34 deletions
diff --git a/jjb/releng/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml index 1c609a4b2..ce1da75d9 100644 --- a/jjb/releng/artifact-cleanup.yml +++ b/jjb/releng/artifact-cleanup.yml @@ -29,10 +29,7 @@ project: '{project}' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm triggers: - timed: 'H H * * *' diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 4813a8877..3df8be1e7 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -82,11 +82,8 @@ default: "" description: "Release version, e.g. 1.0, 2.0, 3.0" - scm: &scm - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + scm: + - git-scm builders: &builders - shell: @@ -100,7 +97,8 @@ name: '{project}-docker-build-push-monitor-{stream}' disabled: '{obj:disabled}' parameters: *parameters - scm: *scm + scm: + - git-scm builders: *builders # trigger only matching the file name diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml index a18374592..cd70a80e4 100644 --- a/jjb/releng/opnfv-docs.yml +++ b/jjb/releng/opnfv-docs.yml @@ -39,10 +39,7 @@ branch: '{branch}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: @@ -92,10 +89,7 @@ description: "JJB configured GERRIT_REFSPEC parameter" scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index c2624debc..7115cce48 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -36,10 +36,7 @@ branch: '{branch}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index fc77c2d48..626daffbd 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -16,10 +16,7 @@ - gerrit-parameter: branch: 'master' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: @@ -71,10 +68,7 @@ branch: 'master' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - gerrit: @@ -114,10 +108,7 @@ branch: 'master' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - timed: '@hourly' |