X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-hc2vpp.yaml;h=aeead71e377f09cd3d5e092ef10f69800d5b4d8e;hb=075ded3718f03d6ad3c3eb23685f06ed6cc8673b;hp=f86dc35bc7dfa2857b917ad425a4a1ef1423022d;hpb=e33ac91e8adc1ae679bbb13d65eaf2dc3dd4c38d;p=ci-management.git

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index f86dc35bc..aeead71e3 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,130 +1,146 @@
+---
 - project:
     name: csit-hc2vpp
-    description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
+    description: 'jenkins jobs verify Hc2vpp functional and performance tests'
     jobs:
-        - 'csit-hc2vpp-verify-func'
-        - 'csit-hc2vpp-verify-perf'
+      - 'csit-hc2vpp-verify-func-{stream}-{os}'
+      - 'csit-hc2vpp-verify-perf-{stream}-{os}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-
     os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+
+    stream:
+      - master:
+          branch: 'master'
+      - '1810':
+          branch: 'rls1810'
+          branch-id: 'oper-rls1810'
+      - '1901':
+          branch: 'rls1901'
+          branch-id: 'oper-rls1901'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-func'
+    name: 'csit-hc2vpp-verify-func-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - os-parameter:
-            os: '{os}'
-        - stream-parameter:
-            stream: 'master'
+      - project-parameter:
+          project: '{project}'
+      - os-parameter:
+          os: '{os}'
+      - stream-parameter:
+          stream: '{stream}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          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:
-            !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
+      - shell:
+          !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
-            latest-only: false
-        - email-notification:
-            email-prefix: '[csit]'
-        - robot-report:
-            output-path: 'csit'
+      - email-notification:
+          email-prefix: '[csit]'
+
+      - robot-report:
+          output-path: 'archive'
+
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-perf'
+    name: 'csit-hc2vpp-verify-perf-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: false
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - os-parameter:
-            os: '{os}'
-        - stream-parameter:
-            stream: 'master'
+      - project-parameter:
+          project: '{project}'
+      - os-parameter:
+          os: '{os}'
+      - stream-parameter:
+          stream: '{stream}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          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:
-            !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh
+      - shell:
+          !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
+      - email-notification:
+          email-prefix: '[csit]'
 
-        - robot-report:
-            output-path: 'csit/archive'
+      - robot-report:
+          output-path: 'archive'
 
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'