X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=00fa8127a7afa07ba8ccc3a709a66e5169b1d8b7;hb=a1b02762e72f8e9b61337d617bf1c3312539eb93;hp=caafe1a58f69c3edf44c0ef9dc4ea439465af864;hpb=09b7219f3e8245613b4be8d162b1fa55ba52a639;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index caafe1a58..00fa8127a 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,17 +1,66 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify'
-        - 'vpp-merge'
+        - 'vpp-verify-{stream}-{os}'
+        - 'vpp-merge-{stream}-{os}'
+        - 'vpp-verify-image-{stream}-{os}'
 
     project: 'vpp'
-    branch: 'master'
+    os:
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+        - centos7:
+            repo-os-part: 'centos7'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
+    type:
+        - short
+        - long
+
+- project:
+    name: vpp-misc
+    jobs:
+        - 'vpp-csit-verify-virl-{stream}'
+        - 'vpp-csit-verify-hw-perf-{stream}-{type}'
+    project: 'vpp'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
+
+    os: ubuntu1404
+    type:
+        - all
+        - short
+        - long
 
 - job-template:
-    name: vpp-verify
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: verify
+    node: 'verify-{os}'
     concurrent: true
 
     logrotate:
@@ -25,6 +74,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
 
     scm:
         - gerrit-trigger-scm:
@@ -44,14 +95,71 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
+
+- job-template:
+    name: 'vpp-verify-image-{stream}-{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: 'Primary'
+            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-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
 
 - job-template:
-    name: vpp-merge
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: merge
+    node: 'merge-{os}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -64,8 +172,12 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
         - maven-project-parameter:
             maven: '{mvn33}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -85,15 +197,143 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
         - maven-target:
             maven-version: '{mvn33}'
             goals: '--version'
-            settings: '{vpp-settings}'
-            global-settings: '{global-settings}'
+            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}'
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
         - shell:
-            !include-raw-escape include-raw-vpp-maven-push.sh
+            !include-raw-escape: include-raw-vpp-maven-push.sh
+    publishers:
+        - archive:
+            artifacts: '*.rpm,*.deb,*.jar'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+
+- job-template:
+    name: 'vpp-csit-verify-virl-{stream}'
+
+    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:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - 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-{stream}-{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:
+        - timestamps
+        - 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"