X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates-csit.yaml;h=40a6a93ffb32c091b6368db81f4b550f8c8bed0b;hb=df20241f0daf01384960de1be6a0c9e5be180a51;hp=4018309d9cb0abf9069665a1f4ceda58830d98b2;hpb=dc7a7c1a40ba23bf5f00b698304489bb09b8ffa5;p=ci-management.git

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 4018309d9..40a6a93ff 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,20 +1,230 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
+    disabled: '{disabled}'
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - 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
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - 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
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -22,6 +232,10 @@
           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:
@@ -37,38 +251,281 @@
     triggers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
       - integration-run-test
 
     publishers:
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
       - integration-robot:
           unstable-if: 0.0
           pass-if: 100.0
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
+    disabled: '{disabled}'
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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}'
+
+    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/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - 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
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-arm64-{stream}-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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}'
+
+    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/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - 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
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-{stream}-csit-{functionality}-testng'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          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/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-arm64-{stream}-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
-          project: 'integration'
+          project: 'integration/csit'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -76,6 +533,10 @@
           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:
@@ -91,14 +552,16 @@
     triggers:
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -108,4 +571,26 @@
       - integration-robot:
           unstable-if: 0.0
           pass-if: 100.0
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true