Merge "VPP: add test optimizer to merge jobs"

diff --combined jjb/vpp/vpp.yaml
index 6a4a8ff,66ec305..71015b3
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -86,17 -86,16 +86,17 @@@
      os: ubuntu1804
      device-node-arch:
        - 1n-skx
 -      - 1n-tx2:
 -          executor: 'vpp-csit-arm-ubuntu18'
 +# Is there a good way to allow manual triggers for tx2?
 +#      - 1n-tx2:
 +#          executor: 'vpp-csit-arm-ubuntu18'
      node-arch:
        - 2n-skx
        - 3n-skx
        - 3n-hsw
 -    exclude:
 -      - stream: '1904'
 -        os: 'ubuntu1804'
 -        device-node-arch: '1n-tx2'
 +#    exclude:
 +#      - stream: '1904'
 +#        os: 'ubuntu1804'
 +#        device-node-arch: '1n-tx2'
  
  - project:
      name: vpp-master-only
@@@ -238,7 -237,7 +238,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
        - naginator:
            rerun-unstable-builds: false
            max-failed-builds: 1
@@@ -314,7 -313,7 +314,7 @@@
        - shell:
            !include-raw-escape:
            - ../scripts/setup_vpp_dpdk_dev_env.sh
-           - include-raw-vpp-build.sh
+           - include-raw-vpp-testauto-build.sh
        - provide-maven-settings:
            settings-file: 'vpp-settings'
            global-settings-file: 'global-settings'
@@@ -324,7 -323,7 +324,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
  
  - job-template:
      name: 'vpp-arm-verify-{stream}-{os}'
@@@ -390,7 -389,7 +390,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
        - naginator:
            rerun-unstable-builds: false
@@@ -479,7 -478,7 +479,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
  
  - job-template:
      name: 'vpp-checkstyle-verify-{stream}'
@@@ -570,7 -569,7 +570,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
        - naginator:
            rerun-unstable-builds: true
@@@ -640,7 -639,7 +640,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
        - naginator:
            rerun-unstable-builds: false
@@@ -697,7 -696,7 +697,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
        - naginator:
            rerun-unstable-builds: false
@@@ -786,7 -785,7 +786,7 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
        - naginator:
            rerun-unstable-builds: false
            max-failed-builds: 1
@@@ -858,7 -857,7 +858,7 @@@
            output-path: 'csit_current/'
  
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
  
  - job-template:
      name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
@@@ -934,7 -933,7 +934,7 @@@
            output-path: 'csit_current/0/'
  
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'
  
  - job-template:
      name: 'vpp-csit-verify-api-crc-{stream}'
@@@ -991,4 -990,4 +991,4 @@@
  
      publishers:
        - fdio-infra-shiplogs:
 -          maven-version: 'mvn33-new'
 +          maven-version: 'mvn36'