X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcsit%2Fcsit.yaml;h=69c90cab6d34fd59e2cf8ecfc699ec17eca6d230;hb=ecab1475357a7c3bc8d00a0244c71438e08a7fd1;hp=d82c9f1d10c62cd5c29c8812349bfa9dcbaffda8;hpb=722f5690a806e9533d819e352cd1c2e007c6c7bf;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index d82c9f1d1..69c90cab6 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 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,38 +17,28 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-verify-{stream}'
-      - 'csit-docs-merge-{stream_timed}'
-      - 'csit-report-merge-{stream}'
-      - 'csit-report-merge-1901_3'
-      - 'csit-report-merge-1904_2'
-      - '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}'
+      - 'csit-trending-merge-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_timed:
-      - master:
-          branch: 'master'
-          executor: 'ubuntu1804-us'
-      - '1904':
-          branch: 'rls1904'
-          executor: 'ubuntu1804-us'
     stream:
       - master:
           branch: 'master'
-          executor: 'ubuntu1804-us'
-      - '1810':
-          branch: 'rls1810'
-          executor: 'ubuntu1604-basebuild-4c-4g'
-      - '1901':
-          branch: 'rls1901'
-          executor: 'ubuntu1604-basebuild-4c-4g'
-      - '1904':
-          branch: 'rls1904'
-          executor: 'ubuntu1804-us'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+      - '2101':
+          branch: 'rls2101'
+      - '2101_1':
+          branch: 'rls2101_1'
+      - '2106':
+          branch: 'rls2106'
 
 - project:
     name: csit-view
@@ -56,75 +46,11 @@
       - project-view
     project-name: csit
 
-
-- job-template:
-    name: 'csit-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: '{executor}'
-    concurrent: true
-    archive-artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-    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}'
-
-    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'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
-
-    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: include-raw-csit-docs.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
-    name: 'csit-docs-merge-{stream_timed}'
+    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
@@ -142,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:
@@ -161,7 +81,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly'
+          jobs: 'csit-vpp-device-{stream}-{os}-{executor-arch}-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -181,33 +101,24 @@
             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: include-raw-csit-docs.sh
+          !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}'
@@ -220,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:
@@ -256,33 +161,23 @@
             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: include-raw-csit-report.sh
+          !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-report-merge-1901_3'
+    name: 'csit-trending-merge-daily-master-{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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -294,18 +189,12 @@
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
-          branch: 'rls1901_3'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
+          branch: '{branch}'
 
     scm:
       - gerrit-trigger-scm:
           credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
 
     wrappers:
@@ -313,121 +202,70 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1901_3'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+      - 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: include-raw-csit-report.sh
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/trending.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - 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.
 
-- job-template:
-    name: 'csit-report-merge-1904_2'
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-failed-tests.txt"}}
 
-    project-type: freestyle
-    node: '{executor-large}'
-    concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+          always: true
+          failure: 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}'
+      - 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.
 
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: 'rls1904_2'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-regressions.txt"}}
 
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
+          always: true
+          failure: false
 
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
+      - 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.
 
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1904_2'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-progressions.txt"}}
 
-    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: include-raw-csit-report.sh
+          always: true
+          failure: false
 
-    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-weekly-2009-lts-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor-large}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
     build-discarder:
@@ -440,9 +278,7 @@
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
-          branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
+          branch: 'rls2009_lts'
 
     scm:
       - gerrit-trigger-scm:
@@ -455,14 +291,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 2,14 * * *'
+      - timed: '0 0 * * 1'
 
     builders:
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
       - shell:
-          !include-raw-escape: include-raw-csit-cpta.sh
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/trending.sh
 
     publishers:
       - email-ext:
@@ -470,24 +307,69 @@
           recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
           reply-to: ''
           content-type: 'text'
-          subject: 'Failed tests as of  $BUILD_TIMESTAMP'
+          subject: '2009 LTS: 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"}}
+                ${{FILE,path="resources/tools/presentation/_build/_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: '2009 LTS: 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="path="resources/tools/presentation/_build/_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: '2009 LTS: 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="path="resources/tools/presentation/_build/_static/vpp/trending-progressions.txt"}}
 
           always: true
           failure: false
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish-docs
+      - fdio-infra-publish
+
 
 - project:
     name: csit-info
     project-name: csit
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-2c-2g
     project: csit
     branch: master
+
+- project:
+    name: csit-sonar
+    project: csit
+    project-name: csit
+    mvn-settings: csit-settings
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    branch: master
+    build-node: centos7-builder-2c-2g
+    jobs:
+      - gerrit-maven-sonar