Merge "Remove beijing CSIT jobs"

[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..df94683 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -9,12 +9,12 @@
 
     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,9 +37,9 @@
     triggers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
 
     builders:
       - integration-install-robotframework
@@ -63,12 +63,12 @@
 
     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}'
@@ -95,9 +95,9 @@
     triggers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration'
+          project: 'integration/csit'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: '**/{project-name}/**'
 
     builders:
       - integration-install-robotframework
@@ -106,25 +106,28 @@
       - 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
+          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: false
+          allow-missing: true
           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
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
@@ -136,12 +139,12 @@
 
     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,9 +167,9 @@
     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}'
@@ -193,12 +196,12 @@
 
     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}'
@@ -225,9 +228,9 @@
     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}'
@@ -242,16 +245,22 @@
       - 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
+          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: false
+          allow-missing: true
           dir: '{html-dir}'
           files: '{html-files}'
           keep-all: false
           link-to-last-build: false
-          name: ExtentReport
\ No newline at end of file
+          name: ExtentReport
+      - lf-infra-publish