Merge "Add a vpp-docs-verify job and move vpp-docs to vpp-merge-docs"

diff --combined jjb/vpp/vpp.yaml
index 9b496fc,5df9968..ff131b2
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -4,7 -4,7 +4,7 @@@
          - 'vpp-verify-{stream}-{os}'
          - 'vpp-merge-{stream}-{os}'
          - 'vpp-verify-image-{stream}-{os}'
-         - 'vpp-docs-{stream}'
+         - 'vpp-docs-merge-{stream}'
  
      project: 'vpp'
      os:
@@@ -101,13 -101,6 +101,13 @@@
              !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}'
@@@ -225,9 -218,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'
@@@ -359,7 -350,65 +359,65 @@@
              description: "TYPE parameter if not given by trigger"
  
  - job-template:
-     name: 'vpp-docs-{stream}'
+     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: '{ssh-credentials}'
+             refspec: ''
+             choosing-strategy: 'default'
+ 
+     wrappers:
+         - ssh-agent-credentials:
+             users:
+                 - '{ssh-credentials}'
+ 
+     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'
@@@ -424,4 -473,11 +482,11 @@@
              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