Merge "Prepare necessary CSIT jobs for VPP 1701 branch (CIMANAGE-19)"

diff --combined jjb/csit/csit.yaml
index e92d5c8,f3f4468..7347498
--- 1/jjb/csit/csit.yaml
--- 2/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@@ -3,7 -3,6 +3,7 @@@
      description: 'CSIT jenkins jobs.'
  
      jobs:
 +        - 'csit-dpdk-perf-{stream}-{type}'
          - 'csit-vpp-perf-{stream}-{type}'
          - 'csit-vpp-functional-{stream}-virl'
          - 'csit-vpp-verify-{stream_timed}-weekly'
@@@ -23,6 -22,9 +23,9 @@@
          - master:
              branch: 'master'
              branch-id: 'oper'
+         - '1701':
+             branch: 'rls1701'
+             branch-id: 'oper-rls1701'
      stream:
          - master:
              branch: 'master'
@@@ -33,6 -35,9 +36,9 @@@
          - '1609':
              branch: 'rls1609'
              branch-id: 'oper-rls1609'
+         - '1701':
+             branch: 'rls1701'
+             branch-id: 'oper-rls1701'
  
  
  - job-template:
@@@ -81,60 -86,6 +87,60 @@@
          - robot-report:
              output-path: ''
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
 +
 +- job-template:
 +    name: 'csit-dpdk-perf-{stream}-{type}'
 +
 +    project-type: freestyle
 +    node: ubuntu1604-basebuild-4c-4g
 +    concurrent: false
 +
 +    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}'
 +        - type-parameter:
 +            type: '{type}'
 +
 +    scm:
 +        - gerrit-trigger-scm:
 +            credentials-id: 'jenkins-gerrit-credentials'
 +            refspec: '$GERRIT_REFSPEC'
 +            choosing-strategy: 'gerrit'
 +
 +    wrappers:
 +      - fdio-infra-wrappers-non-activity-timeout:
 +          build-timeout: 30
 +
 +    triggers:
 +        - gerrit-trigger-manually-triggered:
 +            name: '{project}'
 +            branch: '{branch}'
 +            comment-trigger-value: 'verify-perf-dpdk-{type}'
 +
 +    builders:
 +        - shell:
 +            !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh
 +
 +    publishers:
 +        - archive-artifacts:
 +            artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
 +            latest-only: false
 +
 +        - robot-report:
 +            output-path: ''
 +
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-vpp-perf-{stream}-{type}'
@@@ -319,8 -270,6 +325,8 @@@
                      xpath-type: 'nodeset'
                      xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-vpp-verify-{stream_timed}-weekly'
@@@ -380,8 -329,6 +386,8 @@@
                      remote: origin
                      name: 'refs/heads/{branch-id}-$DATE'
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-vpp-verify-{stream_timed}-semiweekly'
@@@ -430,8 -377,6 +436,8 @@@
          - robot-report:
              output-path: 'csit/archive'
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-vpp-verify-perf-master-nightly-all'
@@@ -609,8 -554,6 +615,8 @@@
                      xpath-type: 'nodeset'
                      xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-docs-verify-{stream}'
@@@ -672,8 -615,6 +678,8 @@@
              only-if-success: true
              default-excludes: false
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - job-template:
      name: 'csit-docs-merge-{stream}'
@@@ -699,8 -640,8 +705,8 @@@
      scm:
          - gerrit-trigger-scm:
              credentials-id: 'jenkins-gerrit-credentials'
 -            refspec: '$GERRIT_REFSPEC'
 -            choosing-strategy: 'gerrit'
 +            refspec: ''
 +            choosing-strategy: 'default'
  
      wrappers:
          - fdio-infra-wrappers:
@@@ -710,19 -651,12 +716,19 @@@
  
      triggers:
          - reverse:
 -            jobs: 'csit-vpp-verify-master-weekly'
 +            jobs: 'csit-vpp-verify-{stream}-weekly'
              result: 'success'
          - gerrit:
 +            server-name: 'Primary'
              trigger-on:
                  - comment-added-contains-event:
                      comment-contains-value: 'run-docs'
 +            projects:
 +              - project-compare-type: 'ANT'
 +                project-pattern: '{project}'
 +                branches:
 +                  - branch-compare-type: 'ANT'
 +                    branch-pattern: '**/{branch}'
              skip-vote:
                  successful: true
                  failed: true
@@@ -751,8 -685,6 +757,8 @@@
              only-if-success: true
              default-excludes: false
  
 +        - fdio-infra-shiplogs:
 +            maven-version: 'mvn33-new'
  
  - parameter:
      name: test-type-parameter