Merge "New strem for honeycomb and hc2vpp stable/1807"

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

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index be3a84c..302109e 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -15,6 +15,12 @@
             branch: 'master'
         - '1710':
             branch: 'rls1710'
+        - '1801':
+            branch: 'rls1801'
+        - '1804':
+            branch: 'rls1804'
+        - '1807':
+            branch: 'rls1807'
 
 - job-template:
     name: 'csit-hc2vpp-verify-func-{stream}-{os}'
@@ -50,17 +56,10 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-hc2vpp-func'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'verify-hc2vpp-func'
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
@@ -77,6 +76,9 @@
         - robot-report:
             output-path: 'archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'csit-hc2vpp-verify-perf-{stream}'
 
@@ -111,18 +113,10 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-hc2vpp-perf'
-
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'verify-hc2vpp-perf'
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell: