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/global/releng-defaults.yml |  6 +-----
 jjb/global/releng-macros.yml   | 33 ++++++++++++++++++---------------
 2 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'jjb/global')

diff --git a/jjb/global/releng-defaults.yml b/jjb/global/releng-defaults.yml
index bf3330657..5003a8f48 100644
--- a/jjb/global/releng-defaults.yml
+++ b/jjb/global/releng-defaults.yml
@@ -9,13 +9,9 @@
         artifactDaysToKeep: 30
         artifactNumToKeep: 100
 
-    ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
 
     project-type: freestyle
 
     node: master
-
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 3afd355e6..46f69b327 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -23,31 +23,34 @@
             name: GERRIT_BRANCH
             default: '{branch}'
             description: "JJB configured GERRIT_BRANCH parameter"
+        - string:
+            name: SSH_CREDENTIAL_ID
+            default: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
+            description: "SSH Credential ID for git access"
+
+- wrapper:
+    name: ssh-agent-wrapper
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '$SSH_CREDENTIAL_ID'
 
 - scm:
     name: git-scm
     scm:
-        - git:
-            credentials-id: '{credentials-id}'
+        - git: &git-scm-defaults
+            credentials-id: '$SSH_CREDENTIAL_ID'
             url: '$GIT_BASE'
-            refspec: ''
             branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            wipe-workspace: true
+                - 'origin/$GERRIT_BRANCH'
+            timeout: 15
 
 - scm:
-    name: gerrit-trigger-scm
+    name: git-scm-gerrit
     scm:
         - git:
-            credentials-id: '{credentials-id}'
-            url: '$GIT_BASE'
-            refspec: '{refspec}'
-            branches:
-                - 'origin/$GERRIT_BRANCH'
-            skip-tag: true
-            choosing-strategy: '{choosing-strategy}'
-            timeout: 15
+            choosing-strategy: 'gerrit'
+            <<: *git-scm-defaults
 
 - trigger:
     name: 'daily-trigger-disabled'
-- 
cgit 1.2.3-korg