Merge "Fix probe job to use ubuntu1604"

diff --combined jjb/vpp/vpp.yaml
index e6637fe,5c0f57b..e495e57
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -82,11 -82,15 +82,11 @@@
  
      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}'
  
@@@ -112,7 -116,7 +112,7 @@@
      name: 'vpp-csit-verify-virl-1604-test-{stream}'
  
      project-type: freestyle
-     node: 'verify-ubuntu1404'
+     node: 'verify-ubuntu1604'
      concurrent: true
  
      logrotate:
@@@ -127,15 -131,19 +127,15 @@@
          - gerrit-parameter:
              branch: '{branch}'
          - os-parameter:
-             os: 'ubuntu1404'
+             os: 'ubuntu1604'
  
      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}'
  
@@@ -193,11 -201,15 +193,11 @@@
  
      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}'
  
@@@ -245,17 -257,21 +245,17 @@@
          - os-parameter:
              os: '{os}'
          - maven-project-parameter:
 -            maven: '{mvn33}'
 +            maven: 'mvn33'
          - 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:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -270,7 -286,7 +270,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
@@@ -314,11 -330,15 +314,11 @@@
  
      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}'
  
@@@ -368,11 -388,15 +368,11 @@@
  
      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}'
  
@@@ -428,11 -452,15 +428,11 @@@
  
      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}'
  
@@@ -443,7 -471,7 +443,7 @@@
  
      builders:
          - maven-target:
 -            maven-version: '{mvn33}'
 +            maven-version: 'mvn33'
              goals: '--version'
              settings: 'vpp-settings'
              settings-type: cfp
@@@ -485,11 -513,15 +485,11 @@@
  
      scm:
          - gerrit-trigger-scm:
 -            credentials-id: '{ssh-credentials}'
 +            credentials-id: 'jenkins-gerrit-credentials'
              refspec: ''
              choosing-strategy: 'default'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -516,7 -548,7 +516,7 @@@
  
      builders:
          - maven-target:
 -            maven-version: '{mvn33}'
 +            maven-version: 'mvn33'
              goals: '--version'
              settings: 'vpp-settings'
              settings-type: cfp
@@@ -534,3 -566,4 +534,3 @@@
              fingerprint: false
              only-if-success: true
              default-excludes: false
 -