Merge "Remove unnecessary ssh-credentials defaults"

[ci-management.git] / jjb / vpp / vpp-lite.yaml

diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml
index 5c11bdc..6574f53 100644 (file)
--- a/jjb/vpp/vpp-lite.yaml
+++ b/jjb/vpp/vpp-lite.yaml
@@ -23,6 +23,9 @@
         - '1606':
             branch: 'stable/1606'
             repo-stream-part: 'stable.1606'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
     type:
         - short
         - long
@@ -50,14 +53,14 @@
 
     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}'
+                - 'jenkins-gerrit-credentials'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -65,6 +68,8 @@
             branch: '{branch}'
 
     builders:
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape: 'include-raw-vpp-lite-build.sh'
 
@@ -91,14 +96,14 @@
 
     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}'
+                - 'jenkins-gerrit-credentials'
 
     triggers:
         - gerrit:
@@ -119,6 +124,8 @@
                 notbuilt: true
 
     builders:
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape: 'include-raw-vpp-lite-build.sh'
 
@@ -142,20 +149,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'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -164,16 +171,6 @@
 
     builders:
         - shell:
-            !include-raw-escape: 'include-raw-vpp-lite-build.sh'
-        - maven-target:
-            maven-version: '{mvn33}'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-maven-push.sh
\ No newline at end of file
+            !include-raw-escape: 'include-raw-vpp-lite-build.sh'
\ No newline at end of file