Merge "Update sdc jjb jobs"

diff --combined jjb/integration/integration-templates-csit.yaml
index 504ee17,ac31050..dac4c28
--- 1/jjb/integration/integration-templates-csit.yaml
--- 2/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@@ -122,9 -122,6 +122,9 @@@
            keep-all: false
            link-to-last-build: false
            name: ExtentReport
 +      - junit:
 +          results: archives/testng-results.xml
 +          health-scale-factor: 1.0
  
  - job-template:
      name: '{project-name}-{stream}-csit-{functionality}'
@@@ -182,3 -179,76 +182,76 @@@
            unstable-if: 0.0
            pass-if: 100.0
        - lf-infra-publish
+ 
+ - job-template:
+     name: '{project-name}-{stream}-csit-{functionality}-testng'
+     disabled: false
+ 
+     project-type: freestyle
+     build-node: 'ubuntu1604-docker-8c-8g'
+     node: '{build-node}'
+ 
+     properties:
+       - lf-infra-properties:
+           project: 'integration'
+           build-days-to-keep: '{build-days-to-keep}'
+ 
+     parameters:
+       - infra-parameters:
+           project: 'integration'
+           branch: '{branch}'
+           refspec: 'refs/heads/{branch}'
+           artifacts: '{archive-artifacts}'
+       - integration-test-plan:
+           test-plan: 'plans/{project-name}/{functionality}'
+       - integration-test-options:
+           test-options: '{robot-options}'
+       - html-publisher-dir:
+           html-dir: '{html-dir}'
+       - html-publisher-files:
+           html-files: '{html-files}'
+ 
+     scm:
+       - gerrit-trigger-scm:
+           refspec: ''
+           choosing-strategy: 'default'
+           submodule-recursive: '{submodule-recursive}'
+ 
+     wrappers:
+       - lf-infra-wrappers:
+           build-timeout: '{build-timeout}'
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ 
+     triggers:
+       - gerrit-trigger-patch-merged:
+           server: '{server-name}'
+           project: 'integration'
+           branch: '{branch}'
+           files: 'test/csit/**/{project-name}/**'
+       - timed: '@daily'
+       - reverse:
+           jobs: '{obj:trigger_jobs}'
+ 
+     builders:
+       - integration-install-robotframework
+       - inject:
+           properties-file: 'env.properties'
+       - integration-run-test
+ 
+     publishers:
+       - integration-robot:
+           unstable-if: 0.0
+           pass-if: 100.0
+       - lf-infra-publish
+       - testng:
+           pattern: archives/testng-results.xml
+           escape-test-description: true
+           escape-exception-msg: true
+           show-failed-builds: true
+       - html-publisher:
+           allow-missing: false
+           dir: '{html-dir}'
+           files: '{html-files}'
+           keep-all: false
+           link-to-last-build: false
+           name: ExtentReport