X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-hc2vpp.yaml;h=c58a27e75e222bf78eb2d196aa4bfd28ac7f91aa;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=7ef5c7408c237db34fa26890b8c253a218273e58;hpb=69477088edf065027c47e27285e91108403faf3b;p=ci-management.git

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 7ef5c7408..c58a27e75 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,25 +1,34 @@
+---
 - project:
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
     jobs:
-        - 'csit-hc2vpp-verify-func-{os}'
-        - 'csit-hc2vpp-verify-perf'
+        - 'csit-hc2vpp-verify-func-{stream}-{os}'
+        - 'csit-hc2vpp-verify-perf-{stream}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+
+    stream:
+        - master:
+            branch: 'master'
+        - '1801':
+            branch: 'rls1801'
+        - '1804':
+            branch: 'rls1804'
+        - '1807':
+            branch: 'rls1807'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-func-{os}'
+    name: 'csit-hc2vpp-verify-func-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -31,7 +40,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -44,17 +55,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:
@@ -71,14 +75,17 @@
         - robot-report:
             output-path: 'archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
-    name: 'csit-hc2vpp-verify-perf'
+    name: 'csit-hc2vpp-verify-perf-{stream}'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -90,7 +97,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -103,18 +112,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: