summaryrefslogtreecommitdiffstats
path: root/jjb/qtip
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-12 07:22:19 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2016-12-19 00:06:06 +0000
commitb2bc05dad00f551cdcaa10c4f3864adc67639dbf (patch)
tree57fc065f79968b7128f978db2e7d6e83d4be8a2e /jjb/qtip
parentf012d1984209359034c326227b9c6a6b31eeb060 (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/qtip')
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml5
-rw-r--r--jjb/qtip/qtip-project-jobs.yml5
2 files changed, 2 insertions, 8 deletions
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index ac9854365..167cb2a2a 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -55,10 +55,7 @@
description: 'Tag to pull docker image'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
- '{auto-trigger-name}'
diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index 8798fd115..a9c8251fc 100644
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -28,10 +28,7 @@
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit: