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

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 6bb6e4f2c..c58a27e75 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
@@ -7,18 +8,18 @@
     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'
-        - '1710':
-            branch: 'rls1710'
         - '1801':
             branch: 'rls1801'
         - '1804':
             branch: 'rls1804'
+        - '1807':
+            branch: 'rls1807'
 
 - job-template:
     name: 'csit-hc2vpp-verify-func-{stream}-{os}'
@@ -27,7 +28,7 @@
     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}'
@@ -54,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:
@@ -81,6 +75,9 @@
         - robot-report:
             output-path: 'archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'csit-hc2vpp-verify-perf-{stream}'
 
@@ -88,7 +85,7 @@
     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}'
@@ -115,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: