X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=aad550813bf05949e0426c2176da4535bd65ea51;hb=c678af5fb96143a161396ae97617b908cbc3fde1;hp=3ef50769e234571ff6cfe69f1dbe63fc208aaf19;hpb=6b410873c22562a23fe4f2112545384518deb04c;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 3ef50769e..19262f745 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -11,1288 +11,293 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+---
 - project:
     name: csit
-    description: 'CSIT jenkins jobs.'
-    os:
-        - 'ubuntu1604'
-        - 'centos7'
+    description: 'CSIT Jenkins jobs.'
 
     jobs:
-        - 'csit-dpdk-perf-{stream}-{type}'
-        - 'csit-vpp-perf-{stream}-{type}'
-        - 'csit-ligato-perf-{stream}-{type}'
-        - 'csit-vpp-functional-{stream}-{os}-virl'
-        - 'csit-vpp-verify-{stream_timed}-{os}-weekly'
-        - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
-        - 'csit-docs-merge-{stream_timed}'
-        - 'csit-docs-verify-{stream}'
-        - 'csit-report-merge-{stream}'
-        - 'csit-trending-daily-master'
-        - 'csit-vpp-perf-trend-daily-master'
-        - 'csit-vpp-perf-trend-semi-weekly-master'
-        - 'csit-vpp-perf-check-{stream}'
-        - 'csit-vpp-perf-mrr-daily-master'
-        - 'csit-vpp-perf-verify-{stream}'
-        - 'csit-nsh_sfc-verify-perf-{stream}'
-        - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
-        - 'csit-tldk-verify-func-{stream}-{os}-virl'
+      - 'csit-docs-merge-{stream}'
+      - 'csit-report-merge-{stream}'
+      - 'csit-trending-daily-master'
 
     project: 'csit'
     branch: 'master'
-    branch-id: 'oper'
+    executor: 'ubuntu1804-us'
+    executor-large: 'ubuntu1804-l'
     build-artifact-num-to-keep: 10
-    type:
-        - all
-    stream_timed:
-        - master:
-            branch: 'master'
-            branch-id: 'oper'
-        - '1804':
-            branch: 'rls1804'
-            branch-id: 'oper-rls1804'
     stream:
-        - master:
-            branch: 'master'
-            branch-id: 'oper'
-        - '1707':
-            branch: 'rls1707'
-            branch-id: 'oper-rls1707'
-        - '1710':
-            branch: 'rls1710'
-            branch-id: 'oper-rls1710'
-        - '1801':
-            branch: 'rls1801'
-            branch-id: 'oper-rls1801'
-        - '1804':
-            branch: 'rls1804'
-            branch-id: 'oper-rls1804'
-
-
-- job-template:
-    name: 'csit-vpp-functional-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-csit-vpp-functional-virl.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: ''
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-dpdk-perf-{stream}-{type}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - type-parameter:
-            type: '{type}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'verify-perf-dpdk-{type}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-perf-{stream}-{type}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - type-parameter:
-            type: '{type}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'verify-perf-{type}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-hw.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-ligato-perf-{stream}-{type}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - type-parameter:
-            type: '{type}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'verify-perf-ligato-{type}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - master:
+          branch: 'master'
+      - '1908_2':
+          branch: 'rls1908_2'
+      - '2001':
+          branch: 'rls2001'
 
+- project:
+    name: csit-view
+    views:
+      - project-view
+    project-name: csit
 
 - job-template:
-    name: 'csit-vpp-verify-{stream_timed}-{os}-weekly'
-    description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch.'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: '0 4 * * 0'
-
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'csit-vpp-ref-verify'
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: ''
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
-    description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: '0 4 * * 2,6'
-
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'csit-verify-vpp'
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit/archive'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-verify-{stream_timed}-centos7-nightly'
-    description: 'Purpose of this job is to validate latest centos7 vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
-
-    project-type: freestyle
-    node: centos7-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: 'H H(3-4) * * *'
-
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'vpp-verify-func-centos7'
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-functional-virl.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit/archive'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'csit-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'csit-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape: include-raw-csit-docs.sh
-
-    publishers:
-        - archive:
-            artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-docs-merge-{stream_timed}'
+    name: 'csit-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: '{executor}'
     concurrent: true
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: 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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - maven-exec:
-            maven-version: 'mvn33-new'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - maven-exec:
+          maven-version: 'mvn33-new'
+      - 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: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly'
-            result: 'success'
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'run-docs'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+      - reverse:
+          jobs: 'csit-vpp-device-{stream}-ubuntu1804-1n-skx-weekly'
+          result: 'success'
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'run-docs'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'csit-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'csit-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape: include-raw-csit-docs.sh
+      - maven-target:
+          maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'csit-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - provide-maven-settings:
+          settings-file: 'csit-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-report-merge-{stream}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: 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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - maven-exec:
-            maven-version: 'mvn33-new'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - maven-exec:
+          maven-version: 'mvn33-new'
+      - 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: 'default'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'run-report'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'run-report'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'csit-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'csit-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape: include-raw-csit-report.sh
+      - maven-target:
+          maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'csit-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - provide-maven-settings:
+          settings-file: 'csit-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/report.sh
 
     publishers:
-        - archive:
-            artifacts: 'resources/tools/report_gen/csit.report.tar.gz'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-trending-daily-master'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
 
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: 'csit-vpp-perf-mrr-daily-master'
-            result: 'failure'
-
-    builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'csit-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'csit-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape: include-raw-csit-cpta.sh
-
-    publishers:
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-perf-trend-daily-master'
-
-    description: |
-      Purpose of this job is to validate latest vpp build from corresponding
-      branch stored in nexus against verified CSIT codebase of corresponding
-      branch.
-
-      objective
-          daily perf trending of vpp master build
-      job
-         name
-             csit-vpp-perf-trend-daily
-         trigger
-             scheduled daily
-      perf test-cases selection
-          all CSIT perf suites
-      default tags for vpp startup config and perf test type
-          1T1C - one worker thread, one core
-          2T2C - two worker threads, two cores
-          X520 - Intel x520-DA2 NIC
-          NDRDISC - discovery of NDR throughput
-      results
-          jjb verify - no
-          present
-              jenkins trending graphs
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: 'csit/archive'
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-perf-trend-semi-weekly-master'
-
-    description: |
-      Purpose of this job is to validate latest vpp build from corresponding
-      branch stored in nexus against verified CSIT codebase of corresponding
-      branch.
-
-      consumer
-          csit-dev trending semi-weekly
-      objective
-          semi-weekly perf trending of vpp master build job
-          name
-              csit-vpp-perf-trend-semi-weekly
-          trigger
-              scheduled semi-weekly
-      perf test-cases selection
-          all CSIT perf suites
-      default tags for vpp startup config and perf test type
-          1T1C - one worker thread, one core
-          2T2C - two worker threads, two cores
-          X710 - Intel x710 Fortville NIC
-          XL710 - Intel xl710 Fortville NIC
-          NDRDISC - discovery of NDR throughput
-      results
-          jjb verify - no
-          present
-              jenkins trending graphs
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: 'csit/archive'
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-perf-check-{stream}'
-
-    description: |
-      consumer
-          csit-dev perf code base checks
-      objective
-          check csit perf code base
-      job
-          name
-              csit-vpp-perf-check
-          trigger
-              see below
-      perf test-cases selection
-          all CSIT perf suites
-      keywords
-          format - keyword, tag_list
-              verify-perf-ndrdisc, NDRDISC
-              verify-perf-pdrdisc, PDRDISC
-              verify-perf-mrr, MRR
-      default tags for vpp startup config and perf test type
-          1T1C
-              one worker thread, one core
-          2T2C
-              two worker threads, two cores
-      results
-          jjb verify
-              PASS/FAIL
-          present
-              no
-          analyse
-              csit project
-                  catch malfunctions
-                  catch degradations
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    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}'
-        - gerrit-parameter:
-            branch: '{branch}'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - maven-exec:
+          maven-version: 'mvn33-new'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ndrdisc'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-pdrdisc'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-mrr'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
+      - timed: '0 2,14 * * *'
 
     builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-check.sh
+      - maven-target:
+          maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'csit-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - provide-maven-settings:
+          settings-file: 'csit-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/cpta.sh
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-perf-mrr-daily-master'
-
-    description: |
-      objective
-          check vpp perf mrr daily
-      job
-          name
-              csit-vpp-perf-mrr-daily
-          trigger
-              daily
-      perf test-cases selection
-          all CSIT perf suites
-      default tags for vpp startup config and perf test type
-          1T1C - one worker thread, one core
-          2T2C - two worker threads, two cores
-      results
-          jjb verify
-              PASS/FAIL
-          present
-              no
-          analyse
-              csit project
-                  catch malfunctions
-                  catch degradations
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - timed: '0 2,16 * * *'
-
-    builders:
-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: 'csit/archive'
-            other-files:
-              - '*.*'
-
-        - trigger:
-            project: 'csit-trending-daily-master'
-            threshold: 'FAILURE'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-
-- job-template:
-    name: 'csit-vpp-perf-verify-{stream}'
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Failed tests as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following tests failed in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-failed-tests.txt"}}
+
+          always: true
+          failure: false
+
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Regressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following regressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-regressions.txt"}}
+
+          always: true
+          failure: false
+
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Progressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following progressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-progressions.txt"}}
+
+          always: true
+          failure: false
+
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
-    description: |
-      objective
-          perf verify - per csit gerrit patch
-      job
-          name
-              csit-vpp-perf-verify
-          trigger
-              keyword in comment to csit patch
-      perf test-cases selection
-          test-cases selected using trigger keywords paired with tags
-          all test-cases are labelled with CSIT RF topic tags defined in
-          csit/docs/tag_documentation.rst
-      proposed keywords
-          focus on testing specified vpp packet processing path
-          format - keyword - tag_list
-          perf_verify_ip4 - IP4Base, IP4Scale2M
-          perf_verify_ip6 - IP6Base, IP6Scale2M
-          perf_verify_l2 - L2XC, L2BD
-          perf_verify_lisp - 4Lisp, 6Lisp
-          perf_verify_vxlan - Vxlan
-          perf_verify_vhost - Vhost
-          perf_verify_memif - Memif
-      default tags for vpp startup config and perf test type
-          1T1C
-              one worker thread, one core
-          X520
-              x520 Niantic NIC
-          NDRDISC
-              discovery of NDR throughput
-      results
-          jjb verify
-              PASS/FAIL
-          present
-              no
-          analyse
-              no
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-lisp'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-vxlan'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-vhost'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ipsechw'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-verify.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-nsh_sfc-verify-perf-{stream}'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: 'ubuntu1604'
-        - stream-parameter:
-            stream: '{stream}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_perf_{stream}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'archive'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-        - stream-parameter:
-            stream: '{stream}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_func_{stream}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'archive'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-tldk-verify-func-{stream}-{os}-virl'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-
-    logrotate:
-        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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'csit_verify_tldk_func'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'archive'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- parameter:
-    name: test-type-parameter
-    parameters:
-        - string:
-            name: TYPE
-            default: '{type}'
-            description: "Test TYPE parameter if not given by trigger"
+- project:
+    name: csit-info
+    project-name: csit
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: csit
+    branch: master