CSIT: Reduce daily jobs cadence for 2106 report data collection

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index ad8c016..9658292 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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,27 +17,26 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-merge-{stream}'
-      - 'csit-report-merge-{stream}'
-      - 'csit-trending-daily-master'
-      - 'csit-trending-weekly-2009-lts'
+      - '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}'
 
     project: 'csit'
     branch: 'master'
-    executor: 'ubuntu1804-us'
-    executor-large: 'ubuntu1804-l'
+    os:
+      - 'ubuntu2004'
+    executor-arch: 'x86_64'
     build-artifact-num-to-keep: 10
     stream:
       - master:
           branch: 'master'
-      - '1908_2':
-          branch: 'rls1908_2'
-      - '2005':
-          branch: 'rls2005'
-      - '2009':
-          branch: 'rls2009'
       - '2009_lts':
           branch: 'rls2009_lts'
+      - '2101':
+          branch: 'rls2101'
+      - '2106':
+          branch: 'rls2106'
 
 - project:
     name: csit-view
@@ -46,10 +45,10 @@
     project-name: csit
 
 - job-template:
-    name: 'csit-docs-merge-{stream}'
+    name: 'csit-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -124,14 +123,13 @@
           - ../scripts/csit/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-report-merge-{stream}'
+    name: 'csit-report-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor-large}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     allow-empty: 'true'
     fingerprint: false
@@ -203,14 +201,13 @@
           - ../scripts/csit/report.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-daily-master'
+    name: 'csit-trending-daily-master-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor-large}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
     build-discarder:
@@ -238,7 +235,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 2,14 * * *'
+      - timed: '0 14 * * 1,3,5'
 
     builders:
       - maven-target:
@@ -304,14 +301,13 @@
           always: true
           failure: false
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-weekly-2009-lts'
+    name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor-large}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
     build-discarder:
@@ -405,8 +401,7 @@
           always: true
           failure: false
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - project:
     name: csit-info