Fix: Patch to emails for CSIT trending

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 9658292..69c90ca 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -19,8 +19,8 @@
     jobs:
       - 'csit-docs-merge-{stream}-{os}-{executor-arch}'
       - 'csit-report-merge-{stream}-{os}-{executor-arch}'
-      - 'csit-trending-daily-master-{os}-{executor-arch}'
-      - 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
+      - 'csit-trending-merge-daily-master-{os}-{executor-arch}'
+      - 'csit-trending-merge-weekly-2009-lts-{os}-{executor-arch}'
 
     project: 'csit'
     branch: 'master'
@@ -35,6 +35,8 @@
           branch: 'rls2009_lts'
       - '2101':
           branch: 'rls2101'
+      - '2101_1':
+          branch: 'rls2101_1'
       - '2106':
           branch: 'rls2106'
 
@@ -66,12 +68,6 @@
           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:
@@ -85,7 +81,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-device-{stream}-ubuntu1804-1n-skx-weekly'
+          jobs: 'csit-vpp-device-{stream}-{os}-{executor-arch}-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -105,16 +101,6 @@
             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:
           - ../scripts/setup_executor_env.sh
@@ -123,6 +109,7 @@
           - ../scripts/csit/docs.sh
 
     publishers:
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
@@ -131,10 +118,7 @@
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -147,17 +131,11 @@
           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'
+          refspec: ''
           choosing-strategy: 'default'
 
     wrappers:
@@ -183,16 +161,6 @@
             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:
           - ../scripts/setup_executor_env.sh
@@ -201,10 +169,11 @@
           - ../scripts/csit/report.sh
 
     publishers:
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-daily-master-{os}-{executor-arch}'
+    name: 'csit-trending-merge-daily-master-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -221,8 +190,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
@@ -235,25 +202,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 14 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     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:
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/cpta.sh
+          - ../scripts/csit/trending.sh
 
     publishers:
       - email-ext:
@@ -266,7 +223,7 @@
           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"}}
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-failed-tests.txt"}}
 
           always: true
           failure: false
@@ -281,7 +238,7 @@
           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"}}
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-regressions.txt"}}
 
           always: true
           failure: false
@@ -296,15 +253,16 @@
           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"}}
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-progressions.txt"}}
 
           always: true
           failure: false
 
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
+    name: 'csit-trending-merge-weekly-2009-lts-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -321,8 +279,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: 'rls2009_lts'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
@@ -338,22 +294,12 @@
       - timed: '0 0 * * 1'
 
     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:
           - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/cpta.sh
+          - ../scripts/csit/trending.sh
 
     publishers:
       - email-ext:
@@ -366,7 +312,7 @@
           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"}}
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-failed-tests.txt"}}
 
           always: true
           failure: false
@@ -381,7 +327,7 @@
           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"}}
+                ${{FILE,path="path="resources/tools/presentation/_build/_static/vpp/trending-regressions.txt"}}
 
           always: true
           failure: false
@@ -396,13 +342,15 @@
           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"}}
+                ${{FILE,path="path="resources/tools/presentation/_build/_static/vpp/trending-progressions.txt"}}
 
           always: true
           failure: false
 
+      - fdio-infra-publish-docs
       - fdio-infra-publish
 
+
 - project:
     name: csit-info
     project-name: csit