From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 17 Oct 2016 18:15:33 +0000 (+0000)
Subject: Merge "Fix probe job to use ubuntu1604"
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=5e77a72b7eafa88bccabfd487a4e1da3650ee5b8;hp=ddae95ebd3ebc2927c57c7ba76c869be3e345dbf;p=ci-management.git

Merge "Fix probe job to use ubuntu1604"
---

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index fbce13ff2..226d77f91 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -26,14 +26,13 @@
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -67,14 +66,13 @@
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -82,8 +80,10 @@
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-jjb-update.sh
+        - shell: |
+            pip freeze
+            jenkins-jobs --version
+            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
 - job-template:
     name: ci-management-verify-zuul
@@ -100,14 +100,13 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$ZUUL_REF'
             commit: '$ZUUL_COMMIT'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -127,14 +126,13 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -157,14 +155,13 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$ZUUL_REF'
             commit: '$ZUUL_COMMIT'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -184,14 +181,13 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh
deleted file mode 100644
index 1a06ecef9..000000000
--- a/jjb/ci-management/include-raw-jjb-update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-jenkins-jobs update --recursive --delete-old --workers 4 jjb/
-
-# Submit patches for any jobs that can be auto updated
-function submitJJB {
-    git commit -asm "Update automated project templates"
-    git push origin HEAD:refs/for/master
-}
-
-gitdir=$(git rev-parse --git-dir); scp -p -P 29418 rotterdam-jobbuilder@gerrit.fd.io:hooks/commit-msg ${gitdir}/hooks/
-git diff --exit-code || submitJJB
diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml
index 6d11904b6..81589ee24 100644
--- a/jjb/csit/csit-vpp-honeycomb.yaml
+++ b/jjb/csit/csit-vpp-honeycomb.yaml
@@ -34,9 +34,8 @@
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - build-result:
diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml
index 12e581c41..0d3068945 100644
--- a/jjb/csit/csit-vpp-pylint.yaml
+++ b/jjb/csit/csit-vpp-pylint.yaml
@@ -35,14 +35,13 @@
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index c9a0d58e4..7ddc89846 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -52,15 +52,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -104,15 +100,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: 1400
 
@@ -290,14 +282,10 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '480'
 
@@ -352,10 +340,6 @@
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: 480
 
@@ -403,10 +387,6 @@
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '1440'
 
diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index d7f9384ee..3283aeb34 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -44,14 +44,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}'
 
@@ -90,14 +87,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}'
 
@@ -148,14 +142,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}'
 
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 192163d76..b5aa1009f 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -9,8 +9,3 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
-
-    ssh-credentials: 'jenkins-gerrit-credentials'
-
-    # Maven versions
-    mvn33: 'Maven_3.3.9'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 1745da037..b5b0e1f14 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -112,6 +112,10 @@
           timeout: '{build-timeout}'
           timeout-var: 'BUILD_TIMEOUT'
           fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+              - 'jenkins-gerrit-credentials'
       - jclouds:
           single-use: True
 
@@ -250,4 +254,3 @@
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'
-
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index d59e19521..8a5011332 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -47,14 +47,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}'
 
@@ -67,7 +64,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -103,14 +100,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}'
 
@@ -136,7 +130,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -167,20 +161,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -190,7 +184,7 @@
             branch: '{branch}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -228,20 +222,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -255,7 +249,7 @@
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -266,7 +260,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'honeycomb-settings'
             settings-type: cfp
diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 7cb2fc938..339f613ac 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -49,14 +49,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}'
 
@@ -67,7 +64,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -115,14 +112,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}'
 
@@ -146,7 +140,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -193,14 +187,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}'
 
@@ -251,14 +242,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}'
 
@@ -310,14 +298,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}'
 
@@ -328,7 +313,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -366,14 +351,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}'
 
@@ -400,7 +382,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -411,5 +393,3 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-nsh_sfc-docs.sh
-
-
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 0ee380686..f0ad3fbc4 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -37,14 +37,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}'
 
@@ -80,14 +77,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}'
 
@@ -135,14 +129,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}'
 
diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml
index 786ec204d..7f55c8a22 100644
--- a/jjb/vpp/vpp-lite.yaml
+++ b/jjb/vpp/vpp-lite.yaml
@@ -53,14 +53,13 @@
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -96,14 +95,13 @@
 
     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}'
 
     triggers:
         - gerrit:
@@ -149,20 +147,19 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -173,4 +170,4 @@
         - shell:
             !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
-            !include-raw-escape: 'include-raw-vpp-lite-build.sh'
\ No newline at end of file
+            !include-raw-escape: 'include-raw-vpp-lite-build.sh'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5c0f57bbc..e495e5788 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -82,15 +82,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -135,15 +131,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -201,15 +193,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -257,21 +245,17 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -286,7 +270,7 @@
         - shell:
             !include-raw-escape: include-raw-vpp-build.sh
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -330,15 +314,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -388,15 +368,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -452,15 +428,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -471,7 +443,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -513,15 +485,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -548,7 +516,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -566,4 +534,3 @@
             fingerprint: false
             only-if-success: true
             default-excludes: false
-