X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcsit%2Fcsit.yaml;h=927b6119db0f15f56624700dae5b2bc6cd97b9af;hb=ea8b53c974750c3c2e1bcaaedb1f1ff77b4de822;hp=8a15bf22b9af8c01ba8ddba35f99adc61811dcce;hpb=0ad4f41b161bd5eb146b26f3baf6a6fbf1c73660;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 8a15bf22b..927b6119d 100644
--- 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,22 +17,25 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-merge-{stream}'
-      - 'csit-report-merge-{stream}'
-      - 'csit-trending-daily-master'
+      - 'csit-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'csit-report-merge-{stream}-{os}-{executor-arch}'
+      - 'csit-trending-merge-daily-master-{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'
-      - '2001':
-          branch: 'rls2001'
+      - '2101':
+          branch: 'rls2101'
+      - '2101_1':
+          branch: 'rls2101_1'
+      - '2106':
+          branch: 'rls2106'
 
 - project:
     name: csit-view
@@ -41,33 +44,25 @@
     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
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - 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:
@@ -81,7 +76,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'
@@ -101,57 +96,39 @@
             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
       - shell:
           !include-raw-escape:
           - ../scripts/csit/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish-docs
+      - 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
-    only-if-success: true
-    default-excludes: false
+    latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - 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'
+          refspec: ''
           choosing-strategy: 'default'
 
     wrappers:
@@ -177,44 +154,33 @@
             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
       - shell:
           !include-raw-escape:
           - ../scripts/csit/report.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish-docs
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-trending-daily-master'
+    name: 'csit-trending-merge-daily-master-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor-large}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
 
     scm:
       - gerrit-trigger-scm:
@@ -230,68 +196,24 @@
       - 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/csit/cpta.sh
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/trending.sh
 
     publishers:
-      - 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'
+      - csit-trending-failed:
+          branch: 'master'
+      - csit-trending-failed-job:
+          branch: 'master'
+      - csit-trending-progressions:
+          branch: 'master'
+      - csit-trending-regressions:
+          branch: 'master'
+      - fdio-infra-publish-docs
+      - fdio-infra-publish
 
 - project:
     name: csit-info