Merge "CSIT: Make script inclusion more readable"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 248f935..ad6689c 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:
@@ -34,15 +34,13 @@
       - master:
           branch: 'master'
           executor: 'ubuntu1804-us'
-      - '1901':
-          branch: 'rls1901'
-          executor: 'ubuntu1604-basebuild-4c-4g'
       - '1904':
           branch: 'rls1904'
           executor: 'ubuntu1804-us'
+      - '1908':
+          branch: 'rls1908'
       - '1908_1':
           branch: 'rls1908_1'
-          executor: 'ubuntu1804-us'
 
 - project:
     name: csit-view
@@ -122,7 +120,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 +196,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 +249,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 +268,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'