From: C.J. Collier <cjcollier@linuxfoundation.org>
Date: Tue, 18 Oct 2016 17:35:59 +0000 (-0700)
Subject: Correct failing JJB processing
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F3475%2F4;hp=af52f35a281fe7c78dfbc801747793551784b5ad;p=ci-management.git

Correct failing JJB processing

* use literal gerrit credentials
* remove wrappers which are defined in a template

Change-Id: Icc827b4435be7a401705f4089821358d6912d937
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
---

diff --git a/jjb/rpm_dpdk/rpm_dpdk.yaml b/jjb/rpm_dpdk/rpm_dpdk.yaml
index 9e341114f..6c116a49b 100644
--- a/jjb/rpm_dpdk/rpm_dpdk.yaml
+++ b/jjb/rpm_dpdk/rpm_dpdk.yaml
@@ -39,14 +39,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -85,14 +82,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -143,14 +137,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'