X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=86f8efc94a0f023a727d6ef58aa856dd6e2a4a5d;hb=21316a6aa857071e89e4d512613a785eddac2ae5;hp=bfd8025391c58c806678fb97f5331c3b13213ff6;hpb=2ea6567acf97ddd46e3ac91b198c6b8bd865ab75;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index bfd802539..86f8efc94 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,15 +1,33 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify-{branch}-{os}'
-        - 'vpp-merge-{branch}-{os}'
+        - 'vpp-verify-{stream}-{os}'
+        - 'vpp-merge-{stream}-{os}'
+        - 'vpp-verify-image-{stream}-{os}'
+        - 'vpp-docs-merge-{stream}'
+        - 'vpp-docs-verify-{stream}'
 
     project: 'vpp'
     os:
-        - ubuntu1404
-        - centos7
-        - ubuntu1604
-    branch: 'master'
+        - 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
@@ -17,10 +35,23 @@
 - project:
     name: vpp-misc
     jobs:
-        - 'vpp-csit-verify-virl'
-        - 'vpp-csit-verify-perf-{type}'
+        - 'vpp-csit-verify-virl-{stream}'
+        - 'vpp-csit-verify-hw-perf-{stream}-{type}'
     project: 'vpp'
-    branch: 'master'
+    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
@@ -28,7 +59,7 @@
         - long
 
 - job-template:
-    name: 'vpp-verify-{branch}-{os}'
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -50,14 +81,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:
@@ -66,11 +96,74 @@
 
     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
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+
+- 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: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    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-{branch}-{os}'
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: 'merge-{os}'
@@ -89,18 +182,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:
@@ -109,20 +203,33 @@
 
     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}'
+            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:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
 
 - job-template:
-    name: 'vpp-csit-verify-virl'
+    name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -144,14 +251,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:
@@ -160,9 +266,11 @@
 
     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-csit-functional.sh
+            !include-raw-escape: include-raw-vpp-build.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-csit-functional.sh
 
     publishers:
         - archive-artifacts:
@@ -173,7 +281,7 @@
             output-path: 'csit'
 
 - job-template:
-    name: 'vpp-csit-verify-perf-{type}'
+    name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -197,14 +305,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-manually-triggered:
@@ -214,9 +321,9 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-vpp-build.sh
+            !include-raw-escape: include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape include-raw-vpp-csit-verify-perf.sh
+            !include-raw-escape: include-raw-vpp-csit-verify-perf.sh
 
     publishers:
         - archive-artifacts:
@@ -234,3 +341,133 @@
             name: TYPE
             default: '{type}'
             description: "TYPE parameter if not given by trigger"
+
+- job-template:
+    name: 'vpp-docs-verify-{stream}'
+
+    project-type: freestyle
+    node: 'verify-ubuntu1604'
+    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: 'ubuntu1604'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - 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'
+        - shell:
+            !include-raw-escape: include-raw-vpp-docs.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/docs/html/*'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+
+- job-template:
+    name: 'vpp-docs-merge-{stream}'
+
+    project-type: freestyle
+    node: 'verify-ubuntu1604'
+    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: 'ubuntu1604'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: 'vpp-merge-{stream}-ubuntu1404'
+            result: 'success'
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'run-docs'
+            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:
+        - 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'
+        - shell:
+            !include-raw-escape: include-raw-vpp-docs.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/docs/html/*'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false