Merge "Remove timed jobs for CSIT rls1707 branch"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index a796608..7a759b4 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -49,9 +49,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1707':
-            branch: 'rls1707'
-            branch-id: 'oper-rls1707'
     stream:
         - master:
             branch: 'master'
@@ -168,8 +165,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
 
         - plot:
             - title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'
@@ -288,8 +287,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
 
         - plot:
             - title: '64B-1t1c-eth-l2*-ndrdisc'
@@ -2779,8 +2780,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
-        - robot-report:
+        - robot:
             output-path: 'csit/archive'
+            other-files:
+              - '*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -3167,8 +3170,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
-        - robot-report:
+        - robot:
             output-path: 'csit/archive'
+            other-files:
+              - '*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -3583,8 +3588,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -3650,8 +3657,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
-        - robot-report:
+        - robot:
             output-path: 'csit/archive'
+            other-files:
+              - '*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -3757,8 +3766,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -3781,6 +3792,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: 'ubuntu1604'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -3796,7 +3811,7 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_perf'
+            comment-trigger-value: 'csit_nsh_sfc_perf_{stream}'
 
     builders:
         - shell:
@@ -3833,6 +3848,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -3848,7 +3865,7 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_func'
+            comment-trigger-value: 'csit_nsh_sfc_func_{stream}'
 
     builders:
         - shell: