X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=e9815d9de58a77c49aa1077c9fbd0f69b98fdcec;hb=243d1fbbc7146792575b5ec920c1ad89b810abab;hp=a95d1751ca7e76540d5ca1e46029feb7e1c00444;hpb=b730e4e6dd99d2adb673420a2eb2ddbfadd1b9a0;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a95d1751c..e9815d9de 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,17 +1,39 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify'
-        - 'vpp-merge'
+        - 'vpp-verify-{branch}-{os}'
+        - 'vpp-merge-{branch}-{os}'
+        - 'vpp-verify-image-{branch}-{os}'
 
     project: 'vpp'
+    os:
+        - ubuntu1404
+        - centos7
+        - ubuntu1604
     branch: 'master'
+    type:
+        - short
+        - long
+
+- project:
+    name: vpp-misc
+    jobs:
+        - 'vpp-csit-verify-virl'
+        - 'vpp-csit-verify-hw-perf-{type}'
+    project: 'vpp'
+    branch: 'master'
+    os: ubuntu1404
+    type:
+        - all
+        - short
+        - long
 
 - job-template:
-    name: vpp-verify
+    name: 'vpp-verify-{branch}-{os}'
 
     project-type: freestyle
-    node: verify
+    node: 'verify-{os}'
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -24,6 +46,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
 
     scm:
         - gerrit-trigger-scm:
@@ -46,10 +70,64 @@
             !include-raw-escape include-raw-vpp-build.sh
 
 - job-template:
-    name: vpp-merge
+    name: 'vpp-verify-image-{branch}-{os}'
+
+    project-type: freestyle
+    node: 'verify-image-{os}'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            server-name: 'Default'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-images'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    builders:
+        - shell:
+            !include-raw-escape include-raw-vpp-build.sh
+
+- job-template:
+    name: 'vpp-merge-{branch}-{os}'
 
     project-type: freestyle
-    node: merge
+    node: 'merge-{os}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -62,6 +140,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+        - maven-project-parameter:
+            maven: '{mvn33}'
 
     scm:
         - gerrit-trigger-scm:
@@ -82,3 +164,127 @@
     builders:
         - shell:
             !include-raw-escape include-raw-vpp-build.sh
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '--version'
+            settings: '{vpp-settings}'
+            global-settings: '{global-settings}'
+        - provide-maven-settings:
+            settings-file: '{vpp-settings}'
+            global-settings-file: '{global-settings}'
+        - shell:
+            !include-raw-escape include-raw-vpp-maven-push.sh
+
+- job-template:
+    name: 'vpp-csit-verify-virl'
+
+    project-type: freestyle
+    node: 'verify-{os}'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape include-raw-vpp-build.sh
+        - shell:
+            !include-raw-escape include-raw-vpp-csit-functional.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit'
+
+- job-template:
+    name: 'vpp-csit-verify-hw-perf-{type}'
+
+    project-type: freestyle
+    node: 'verify-{os}'
+    concurrent: false
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+        - type-parameter:
+            type: '{type}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'verify-perf-{type}'
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape include-raw-vpp-build.sh
+        - shell:
+            !include-raw-escape include-raw-vpp-csit-verify-perf.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit'
+
+- parameter:
+    name: type-parameter
+
+    parameters:
+        - string:
+            name: TYPE
+            default: '{type}'
+            description: "TYPE parameter if not given by trigger"