Merge "VPP: added 1804 to arm verify stream and arm merge"

diff --combined jjb/vpp/vpp.yaml
index fe396d4,e5d4c45..95dd949
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -80,11 -80,15 +80,15 @@@
      name: vpp-arm
      jobs:
          - 'vpp-arm-verify-{stream}-{os}'
+         - 'vpp-arm-merge-{stream}-{os}'
      project: 'vpp'
      stream:
          - master:
              branch: 'master'
              repo-stream-part: 'master'
+         - '1804':
+             branch: 'stable/1804'
+             repo-stream-part: 'stable.1804'
      os:
        - ubuntu1604:
            repo-os-part: 'ubuntu.xenial.main'
@@@ -164,7 -168,7 +168,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-arm-verify-{stream}-{os}'
@@@ -213,11 -217,6 +217,6 @@@
                    branches:
                      - branch-compare-type: 'ANT'
                        branch-pattern: '**/{branch}'
-             skip-vote:
-                 successful: true
-                 failed: true
-                 unstable: true
-                 notbuilt: true
              override-votes: true
              gerrit-build-notbuilt-verified-value: 0
              notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
@@@ -227,7 -226,7 +226,7 @@@
          - shell:
              !include-raw-escape:
                  - ../scripts/setup_vpp_dpdk_dev_env.sh
-                 - include-raw-vpp-build.sh
+                 - include-raw-vpp-arm-build.sh
      publishers:
          - archive:
              artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
@@@ -238,6 -237,111 +237,111 @@@
          - fdio-infra-shiplogs:
              maven-version: 'mvn33-new'
              archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+         - naginator:
+             rerun-unstable-builds: true
+             max-failed-builds: 1
+             fixed-delay: 90
+ 
+ - job-template:
+     name: 'vpp-arm-merge-{stream}-{os}'
+ 
+     project-type: freestyle
+     node: '{os}arm-us'
+ 
+     logrotate:
+         daysToKeep: '{build-days-to-keep}'
+         numToKeep: 100
+         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}'
+         - maven-project-parameter:
+             maven: 'mvn33-new'
+         - maven-exec:
+             maven-version: 'mvn33-new'
+         - stream-parameter:
+             stream: '{stream}'
+         - repo-name-parameter:
+             repo-name: '{repo-stream-part}.{repo-os-part}'
+ 
+     scm:
+         - gerrit-trigger-scm:
+             credentials-id: 'jenkins-gerrit-credentials'
+             refspec: ''
+             choosing-strategy: 'default'
+ 
+     wrappers:
+         - fdio-infra-wrappers:
+             build-timeout: '{build-timeout}'
+ 
+     triggers:
+         - gerrit:
+             server-name: 'Primary'
+             trigger-on:
+                 - comment-added-contains-event:
+                     comment-contains-value: 'armmerge'
+             projects:
+                 - project-compare-type: 'ANT'
+                   project-pattern: '{project}'
+                   branches:
+                     - branch-compare-type: 'ANT'
+                       branch-pattern: '**/{branch}'
+             override-votes: true
+             gerrit-build-notbuilt-verified-value: 0
+             notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
+ 
+     builders:
+         - config-file-provider:
+             files:
+               - file-id: '.packagecloud'
+                 target: '/home/jenkins'
+         - config-file-provider:
+             files:
+               - file-id: 'packagecloud_api'
+                 target: '/home/jenkins'
+         - maven-target:
+             maven-version: 'mvn33-new'
+             goals: '--version'
+             settings: 'vpp-settings'
+             settings-type: cfp
+             global-settings: 'global-settings'
+             global-settings-type: cfp
+         - shell:
+             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+         - shell:
+             !include-raw-escape:
+                 - ../scripts/setup_vpp_dpdk_dev_env.sh
+                 - include-raw-vpp-arm-build.sh
+         - provide-maven-settings:
+             settings-file: 'vpp-settings'
+             global-settings-file: 'global-settings'
+         - shell:
+             !include-raw-escape:
+                 - ../scripts/maven_push_functions.sh
+                 - include-raw-vpp-maven-push.sh
+         - shell:
+             !include-raw-escape:
+                 - ../scripts/packagecloud_push.sh
+ 
+     publishers:
+         - archive:
+             artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+             allow-empty: 'true'
+             fingerprint: false
+             only-if-success: true
+             default-excludes: false
+         - fdio-infra-shiplogs:
+             maven-version: 'mvn33-new'
+         - naginator:
+             rerun-unstable-builds: true
+             max-failed-builds: 1
+             fixed-delay: 90
  
  - job-template:
      name: 'vpp-checkstyle-verify-{stream}'
@@@ -309,7 -413,7 +413,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-verify-{stream}-{os}'
@@@ -373,7 -477,7 +477,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 2
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-verify-{stream}-clang'
@@@ -427,7 -531,7 +531,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-verify-os-{stream}-{os}'
@@@ -580,7 -684,7 +684,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-merge-os-{stream}-{os}'
@@@ -744,7 -848,7 +848,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  
  - job-template:
@@@ -983,7 -1087,7 +1087,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-docs-merge-{stream}'
@@@ -1066,7 -1170,7 +1170,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  
  - job-template:
@@@ -1134,7 -1238,7 +1238,7 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90
  
  - job-template:
      name: 'vpp-make-test-docs-merge-{stream}'
@@@ -1217,6 -1321,6 +1321,6 @@@
          - naginator:
              rerun-unstable-builds: true
              max-failed-builds: 1
 -            fixed-delay: 10
 +            fixed-delay: 90