Merge "Remove the need for mvn33 defaults"

diff --combined jjb/honeycomb/honeycomb.yaml
index d59e195,beaacc2..25cef96
--- 1/jjb/honeycomb/honeycomb.yaml
--- 2/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@@ -10,9 -10,6 +10,9 @@@
          - ubuntu1404:
              repo-os-part: 'ubuntu.trusty.main'
              skip-site: 'false'
 +        - ubuntu1604:
 +            repo-os-part: 'ubuntu.xenial.main'
 +            skip-site: 'true'
          - centos7:
              repo-os-part: 'centos7'
              skip-site: 'true'
@@@ -29,7 -26,6 +29,7 @@@
      project-type: maven
      node: verify-{os}
      concurrent: true
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -67,7 -63,7 +67,7 @@@
          - shell: |
              if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
      maven:
-         maven-name: '{mvn33}'
+         maven-name: 'mvn33'
          root-pom: 'pom.xml'
          goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
          maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@@ -85,7 -81,6 +85,7 @@@
      project-type: maven
      node: 'verify-image-{os}'
      concurrent: true
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -136,7 -131,7 +136,7 @@@
          - shell: |
              if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
      maven:
-         maven-name: '{mvn33}'
+         maven-name: 'mvn33'
          root-pom: 'pom.xml'
          goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
          maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@@ -167,7 -162,7 +167,7 @@@
          - os-parameter:
              os: '{os}'
          - maven-project-parameter:
-             maven: '{mvn33}'
+             maven: 'mvn33'
          - repo-name-parameter:
              repo-name: '{repo-stream-part}.{repo-os-part}'
  
@@@ -190,7 -185,7 +190,7 @@@
              branch: '{branch}'
  
      maven:
-         maven-name: '{mvn33}'
+         maven-name: 'mvn33'
          root-pom: 'pom.xml'
          goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
          maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@@ -214,7 -209,6 +214,7 @@@
      name: 'honeycomb-integration-{stream}-{os}'
      project-type: maven
      node: merge-{os}
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -228,7 -222,7 +228,7 @@@
          - os-parameter:
              os: '{os}'
          - maven-project-parameter:
-             maven: '{mvn33}'
+             maven: 'mvn33'
          - repo-name-parameter:
              repo-name: '{repo-stream-part}.{repo-os-part}'
  
@@@ -255,7 -249,7 +255,7 @@@
              if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
  
      maven:
-         maven-name: '{mvn33}'
+         maven-name: 'mvn33'
          root-pom: 'pom.xml'
          goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
          maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@@ -266,7 -260,7 +266,7 @@@
  
      postbuilders:
          - maven-target:
-             maven-version: '{mvn33}'
+             maven-version: 'mvn33'
              goals: '--version'
              settings: 'honeycomb-settings'
              settings-type: cfp

diff --combined jjb/vpp/vpp.yaml
index 99c27b6,85382ad..5462465
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -37,7 -37,6 +37,7 @@@
      jobs:
          - 'vpp-csit-verify-virl-{stream}'
          - 'vpp-csit-verify-hw-perf-{stream}-{type}'
 +        - 'vpp-csit-verify-virl-1604-test-{stream}'
      project: 'vpp'
      stream:
          - master:
@@@ -100,72 -99,6 +100,72 @@@
              branch: '{branch}'
  
      builders:
 +        - shell:
 +            !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-csit-verify-virl-1604-test-{stream}'
 +
 +    project-type: freestyle
 +    node: 'verify-ubuntu1404'
 +    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: 'ubuntu1404'
 +
 +    scm:
 +        - gerrit-trigger-scm:
 +            credentials-id: '{ssh-credentials}'
 +            refspec: '$GERRIT_REFSPEC'
 +            choosing-strategy: 'gerrit'
 +
 +    wrappers:
 +        - timestamps
 +        - ssh-agent-credentials:
 +            users:
 +                - '{ssh-credentials}'
 +        - fdio-infra-wrappers:
 +            build-timeout: '{build-timeout}'
 +
 +    triggers:
 +        - gerrit:
 +            server-name: 'Primary'
 +            trigger-on:
 +                - comment-added-contains-event:
 +                    comment-contains-value: 'virl-1604-test'
 +            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:
@@@ -257,7 -190,7 +257,7 @@@
          - os-parameter:
              os: '{os}'
          - maven-project-parameter:
-             maven: '{mvn33}'
+             maven: 'mvn33'
          - repo-name-parameter:
              repo-name: '{repo-stream-part}.{repo-os-part}'
  
@@@ -286,7 -219,7 +286,7 @@@
          - shell:
              !include-raw-escape: include-raw-vpp-build.sh
          - maven-target:
-             maven-version: '{mvn33}'
+             maven-version: 'mvn33'
              goals: '--version'
              settings: 'vpp-settings'
              settings-type: cfp
@@@ -471,7 -404,7 +471,7 @@@
  
      builders:
          - maven-target:
-             maven-version: '{mvn33}'
+             maven-version: 'mvn33'
              goals: '--version'
              settings: 'vpp-settings'
              settings-type: cfp
@@@ -548,7 -481,7 +548,7 @@@
  
      builders:
          - maven-target:
-             maven-version: '{mvn33}'
+             maven-version: 'mvn33'
              goals: '--version'
              settings: 'vpp-settings'
              settings-type: cfp