X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=730ab847d48857315eb1c7fe33c319715f425a0a;hb=4bbc40d0848f1ac62ce2f95bab3ef1b0d08acb3e;hp=91d2240d53e91f6f5c113b51a8fa4cd6b4ddac48;hpb=ed61c534eea711525913ef3b95c7900b4ead62bf;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 91d2240d5..730ab847d 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,7 +4,8 @@
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
         - 'vpp-verify-image-{stream}-{os}'
-        - 'vpp-docs-1609'
+        - 'vpp-docs-merge-{stream}'
+        - 'vpp-docs-verify-{stream}'
 
     project: 'vpp'
     os:
@@ -27,6 +28,9 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1701'
     type:
         - short
         - long
@@ -50,8 +54,11 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1609'
 
-    os: ubuntu1404
+    os: ubuntu1604
     type:
         - all
         - short
@@ -61,7 +68,7 @@
     name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -80,14 +87,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:
@@ -99,12 +105,19 @@
             !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}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -123,14 +136,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:
@@ -160,7 +172,7 @@
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -176,20 +188,21 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - 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:
@@ -202,7 +215,7 @@
         - shell:
             !include-raw-escape: include-raw-vpp-build.sh
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -212,7 +225,9 @@
             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'
@@ -225,7 +240,7 @@
     name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -241,18 +256,18 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     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}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -279,7 +294,7 @@
     name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: false
 
     logrotate:
@@ -297,18 +312,18 @@
             os: '{os}'
         - type-parameter:
             type: '{type}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     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-non-activity-timeout:
+            build-timeout: 30
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -340,10 +355,10 @@
             description: "TYPE parameter if not given by trigger"
 
 - job-template:
-    name: 'vpp-docs-1609'
+    name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1404'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -356,23 +371,85 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'stable/1609'
+            branch: '{branch}'
         - os-parameter:
-            os: 'ubuntu1404'
+            os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            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-new'
+            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: ubuntu1604-basebuild-4c-4g
+    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'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
+        - reverse:
+            jobs: 'vpp-merge-{stream}-ubuntu1404'
+            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
@@ -383,7 +460,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/stable/1609'
+                    branch-pattern: '**/{branch}'
             skip-vote:
                 successful: true
                 failed: true
@@ -392,7 +469,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -403,4 +480,10 @@
             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