Merge "Remove obsolete TestNG JJB templates"

[ci-management.git] / jjb / integration / integration-templates-csit.yaml

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index dac4c28..a841ad9 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,20 +1,22 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     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}'
@@ -37,11 +39,13 @@
     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'
@@ -52,23 +56,29 @@
           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'
+    name: '{project-name}-arm64-{stream}-verify-csit-{functionality}'
     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,10 +86,6 @@
           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:
@@ -95,11 +101,13 @@
     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'
@@ -110,38 +118,29 @@
           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
-      - junit:
-          results: archives/testng-results.xml
-          health-scale-factor: 1.0
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     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}'
@@ -164,14 +163,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'
@@ -182,23 +183,29 @@
           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'
+    name: '{project-name}-arm64-{stream}-csit-{functionality}'
     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}'
@@ -206,10 +213,6 @@
           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:
@@ -225,14 +228,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'
@@ -243,15 +248,7 @@
           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
\ No newline at end of file
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true