Merge "vpp: make test-doc output moved"

diff --combined jjb/vpp/vpp.yaml
index 27eb64c,5d8a32a..4f81c6c
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -16,9 -16,6 +16,6 @@@
        - master:
            branch: 'master'
            repo-stream-part: 'master'
-       - '1901':
-           branch: 'stable/1901'
-           repo-stream-part: 'stable.1901'
        - '1904':
            branch: 'stable/1904'
            repo-stream-part: 'stable.1904'
@@@ -72,9 -69,7 +69,9 @@@
        - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
        - 'vpp-csit-verify-perf-{stream}-{node-arch}'
      project: 'vpp'
 -    executor: 'vpp-csit-device'
 +    os: ubuntu1804
 +    device-executor: 'vpp-csit-device'
 +    executor: '{os}-us'
      skip-vote: 'true'
      trigger: 'gerrit-trigger-csit-devicetest-full'
      stream:
@@@ -87,10 -82,11 +84,10 @@@
        - '1908':
            branch: 'stable/1908'
            repo-stream-part: 'stable.1908'
 -    os: ubuntu1804
      device-node-arch:
        - 1n-skx
        - 1n-tx2:
 -          executor: 'vpp-csit-arm-ubuntu18'
 +          device-executor: 'vpp-csit-arm-ubuntu18'
            trigger: 'gerrit-trigger-csit-devicetest-manual'
      node-arch:
        - 2n-clx
@@@ -99,8 -95,7 +96,8 @@@
        - 3n-hsw
        - 2n-dnv
        - 3n-dnv
 -      - 3n-tsh
 +      - 3n-tsh:
 +          executor: 'ubuntu1804arm-s'
      exclude:
        - stream: '1904'
          os: 'ubuntu1804'
@@@ -849,16 -844,9 +846,16 @@@
  
  - job-template:
      name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
 +    description: |
 +      <ul>
 +          <li>executor
 +              <ul>
 +                  <li>{device-executor}
 +              </ul>
 +      </ul>
  
      project-type: freestyle
 -    node: '{executor}'
 +    node: '{device-executor}'
      concurrent: true
      archive-artifacts: '**/csit_current/**/*.*'
      latest-only: false
@@@ -924,16 -912,9 +921,16 @@@
  
  - job-template:
      name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
 +    description: |
 +      <ul>
 +          <li>executor
 +              <ul>
 +                  <li>{executor}
 +              </ul>
 +      </ul>
  
      project-type: freestyle
 -    node: '{os}-us'
 +    node: '{executor}'
      concurrent: true
      archive-artifacts: >
        **/csit_current/**/*.*
@@@ -959,10 -940,14 +956,10 @@@
        - gerrit-event-type-parameter
        - gerrit-event-comment-text-parameter
        - gerrit-csit-refspec-parameter
 -      - string:
 -          name: CSIT_PERF_TRIAL_DURATION
 -          default: "10.0"
 -          description: "Duration of a trial measurement in BMRR tests."
 -      - string:
 -          name: CSIT_PERF_TRIAL_MULTIPLICITY
 -          default: "5"
 -          description: "Number of subsamples for BMRR tests."
 +      - csit-perf-trial-duration-parameter:
 +          csit-perf-trial-duration: "10.0"
 +      - csit-perf-trial-multiplicity-parameter:
 +          csit-perf-trial-multiplicity: "5"
        - stream-parameter:
            stream: '{stream}'
        - string: