Merge "Convert csit to be Packer compliant"

diff --combined jjb/csit/csit.yaml
index 4354bb0,cc55d8a..0df84b3
--- 1/jjb/csit/csit.yaml
--- 2/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@@ -8,8 -8,6 +8,8 @@@
          - 'csit-vpp-verify-{stream_timed}-weekly'
          - 'csit-vpp-verify-{stream_timed}-semiweekly'
          - 'csit-vpp-verify-perf-master-nightly-all'
 +        - 'csit-docs-merge-{stream}'
 +        - 'csit-docs-verify-{stream}'
  
      project: 'csit'
      branch: 'master'
@@@ -33,12 -31,11 +33,12 @@@
              branch: 'rls1609'
              branch-id: 'oper-rls1609'
  
 +
  - job-template:
      name: 'csit-vpp-functional-{stream}-virl'
  
      project-type: freestyle
-     node: verify-ubuntu1604
+     node: ubuntu1604-basebuild-4c-4g
      concurrent: true
  
      logrotate:
@@@ -80,12 -77,11 +80,12 @@@
          - robot-report:
              output-path: ''
  
 +
  - job-template:
      name: 'csit-vpp-perf-{stream}-{type}'
  
      project-type: freestyle
-     node: verify-ubuntu1604
+     node: ubuntu1604-basebuild-4c-4g
      concurrent: false
  
      logrotate:
@@@ -264,13 -260,12 +264,13 @@@
                      xpath-type: 'nodeset'
                      xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
  
 +
  - job-template:
      name: 'csit-vpp-verify-{stream_timed}-weekly'
      description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.'
  
      project-type: freestyle
-     node: verify-ubuntu1604
+     node: ubuntu1604-basebuild-4c-4g
      concurrent: false
  
      logrotate:
@@@ -329,7 -324,7 +329,7 @@@
      description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
  
      project-type: freestyle
-     node: verify-ubuntu1604
+     node: ubuntu1604-basebuild-4c-4g
      concurrent: false
  
      logrotate:
@@@ -371,13 -366,12 +371,13 @@@
          - robot-report:
              output-path: 'csit/archive'
  
 +
  - job-template:
      name: 'csit-vpp-verify-perf-master-nightly-all'
      description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
  
      project-type: freestyle
-     node: verify-ubuntu1604
+     node: ubuntu1604-basebuild-4c-4g
      concurrent: false
  
      logrotate:
@@@ -548,134 -542,6 +548,134 @@@
                      xpath-type: 'nodeset'
                      xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
  
 +
 +- job-template:
 +    name: 'csit-docs-verify-{stream}'
 +
 +    project-type: freestyle
 +    node: 'verify-ubuntu1604'
 +    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}'
 +
 +    scm:
 +        - gerrit-trigger-scm:
 +            credentials-id: 'jenkins-gerrit-credentials'
 +            refspec: '$GERRIT_REFSPEC'
 +            choosing-strategy: 'gerrit'
 +
 +    wrappers:
 +        - fdio-infra-wrappers:
 +            build-timeout: '{build-timeout}'
 +        - fdio-infra-wrappers-non-activity-timeout:
 +            build-timeout: 360
 +
 +    triggers:
 +        - gerrit-trigger-patch-submitted:
 +            name: '{project}'
 +            branch: '{branch}'
 +
 +    builders:
 +        - maven-target:
 +            maven-version: 'mvn33'
 +            goals: '--version'
 +            settings: 'csit-settings'
 +            settings-type: cfp
 +            global-settings: 'global-settings'
 +            global-settings-type: cfp
 +        - provide-maven-settings:
 +            settings-file: 'csit-settings'
 +            global-settings-file: 'global-settings'
 +        - shell:
 +            !include-raw-escape: include-raw-csit-docs.sh
 +
 +    publishers:
 +        - archive:
 +            artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
 +            allow-empty: 'true'
 +            fingerprint: false
 +            only-if-success: true
 +            default-excludes: false
 +
 +
 +- job-template:
 +    name: 'csit-docs-merge-{stream}'
 +
 +    project-type: freestyle
 +    node: 'verify-ubuntu1604'
 +    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}'
 +
 +    scm:
 +        - gerrit-trigger-scm:
 +            credentials-id: 'jenkins-gerrit-credentials'
 +            refspec: '$GERRIT_REFSPEC'
 +            choosing-strategy: 'gerrit'
 +
 +    wrappers:
 +        - fdio-infra-wrappers:
 +            build-timeout: '{build-timeout}'
 +        - fdio-infra-wrappers-non-activity-timeout:
 +            build-timeout: 360
 +
 +    triggers:
 +        - reverse:
 +            jobs: 'csit-vpp-verify-master-weekly'
 +            result: 'success'
 +        - gerrit:
 +            trigger-on:
 +                - comment-added-contains-event:
 +                    comment-contains-value: 'run-docs'
 +            skip-vote:
 +                successful: true
 +                failed: true
 +                unstable: true
 +                notbuilt: true
 +
 +    builders:
 +        - maven-target:
 +            maven-version: 'mvn33'
 +            goals: '--version'
 +            settings: 'csit-settings'
 +            settings-type: cfp
 +            global-settings: 'global-settings'
 +            global-settings-type: cfp
 +        - provide-maven-settings:
 +            settings-file: 'csit-settings'
 +            global-settings-file: 'global-settings'
 +        - shell:
 +            !include-raw-escape: include-raw-csit-docs.sh
 +
 +    publishers:
 +        - archive:
 +            artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
 +            allow-empty: 'true'
 +            fingerprint: false
 +            only-if-success: true
 +            default-excludes: false
 +
 +
  - parameter:
      name: test-type-parameter
      parameters: