From b2bc05dad00f551cdcaa10c4f3864adc67639dbf Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Mon, 12 Dec 2016 07:22:19 +0000 Subject: 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 --- jjb/bottlenecks/bottlenecks-ci-jobs.yml | 5 +---- jjb/bottlenecks/bottlenecks-project-jobs.yml | 15 +++------------ 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'jjb/bottlenecks') diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 7f2e6bf8a..48cca0dae 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -119,10 +119,7 @@ description: "docker image tag used for version control" scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - 'bottlenecks-env-cleanup' diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 27eb01afa..e5066aace 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -47,10 +47,7 @@ - 'opnfv-build-ubuntu-defaults' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit triggers: - gerrit: @@ -88,10 +85,7 @@ - 'opnfv-build-ubuntu-defaults' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm triggers: - gerrit: @@ -134,10 +128,7 @@ gs-packagepath: '{gs-packagepath}' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - 'bottlenecks-builder-upload-artifact' -- cgit 1.2.3-korg