Merge "Add CSIT rls1908_2 branch"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 248f935..19262f7 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 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:
@@ -17,7 +17,7 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-merge-{stream_timed}'
+      - 'csit-docs-merge-{stream}'
       - 'csit-report-merge-{stream}'
       - 'csit-trending-daily-master'
 
@@ -26,23 +26,13 @@
     executor: 'ubuntu1804-us'
     executor-large: 'ubuntu1804-l'
     build-artifact-num-to-keep: 10
-    stream_timed:
-      - master:
-          branch: 'master'
-          executor: 'ubuntu1804-us'
     stream:
       - master:
           branch: 'master'
-          executor: 'ubuntu1804-us'
-      - '1901':
-          branch: 'rls1901'
-          executor: 'ubuntu1604-basebuild-4c-4g'
-      - '1904':
-          branch: 'rls1904'
-          executor: 'ubuntu1804-us'
-      - '1908_1':
-          branch: 'rls1908_1'
-          executor: 'ubuntu1804-us'
+      - '1908_2':
+          branch: 'rls1908_2'
+      - '2001':
+          branch: 'rls2001'
 
 - project:
     name: csit-view
@@ -51,7 +41,7 @@
     project-name: csit
 
 - job-template:
-    name: 'csit-docs-merge-{stream_timed}'
+    name: 'csit-docs-merge-{stream}'
 
     project-type: freestyle
     node: '{executor}'
@@ -91,7 +81,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly'
+          jobs: 'csit-vpp-device-{stream}-ubuntu1804-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -122,7 +112,8 @@
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: include-raw-csit-docs.sh
+          !include-raw-escape:
+          - ../scripts/csit/docs.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -197,7 +188,8 @@
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: include-raw-csit-report.sh
+          !include-raw-escape:
+          - ../scripts/csit/report.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -249,7 +241,8 @@
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: include-raw-csit-cpta.sh
+          !include-raw-escape:
+          - ../scripts/csit/cpta.sh
 
     publishers:
       - email-ext:
@@ -267,6 +260,36 @@
           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'