From b2bc05dad00f551cdcaa10c4f3864adc67639dbf Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
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 <r-mibu@cq.jp.nec.com>
---
 jjb/armband/armband-ci-jobs.yml      |  5 +----
 jjb/armband/armband-project-jobs.yml |  5 +----
 jjb/armband/armband-verify-jobs.yml  | 18 ++++--------------
 3 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'jjb/armband')

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 77718e181..2c355b750 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -209,10 +209,7 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     wrappers:
         - build-name:
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 4b2a7b50e..64c320dbd 100644
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -41,10 +41,7 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - pollscm:
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index f99ed572c..9bfe4f4fd 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -53,15 +53,10 @@
             option: 'project'
 
     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: 360
             fail: true
@@ -184,15 +179,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: 360
             fail: true
-- 
cgit 1.2.3-korg