X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=03e3cbb302532156a0fc4c3d122593e0c23671c8;hb=4455de64f7c977881389521294b27fb9d85eae57;hp=99a3a067d5007077130a20aa6f76b263aa3550cb;hpb=981608c0b806ef34cd85500285d3967417184ac3;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 99a3a067d..03e3cbb30 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -33,21 +33,20 @@
     jobs:
       - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
-    os: 'ubuntu2004'
+    os:
+      - ubuntu2204
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
     executor-arch: 'x86_64'
+
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
 # VPP-X86_64 PROJECT
@@ -66,42 +65,52 @@
       - 'vpp-merge-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     make-parallel-jobs: '4'
-    make-test-os: 'ubuntu-20.04'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: 'debian-11'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: 'debian-11'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: 'debian-11'
     os:
-      - centos8
-      - debian10
-      - ubuntu1804
+      - debian11
       - ubuntu2004
+      - ubuntu2204
     executor-arch: 'x86_64'
-    exclude:
-      # OS deprecated in master
-      - stream: 'master'
-        os: 'centos8'
-      - stream: 'master'
-        os: 'ubuntu1804'
-      # OS deprecated on 2110
-      - stream: '2110'
-        os: 'centos8'
-      # OS deprecated on 2202
-      - stream: '2202'
-        os: 'centos8'
-      - stream: '2202'
-        os: 'ubuntu1804'
 # [end] VPP-X86_64 PROJECT
 
+# VPP-GCC-X86_64 PROJECT
+- project:
+    name: vpp-gcc-x86_64
+    jobs:
+      - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    make-parallel-jobs: '4'
+    os:
+      - ubuntu2204
+    executor-arch: 'x86_64'
+    stream:
+      - 'master':
+          branch: 'master'
+          branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
+
+# [end] VPP-GCC-X86_64 PROJECT
+
 # VPP-DEBUG-X86_64 PROJECT
 #
 # Currently a periodic job due to intermittent failures.
@@ -114,40 +123,66 @@
       - 'vpp-debug-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     make-parallel-jobs: '4'
-    make-test-os: 'ubuntu-20.04'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
     comment-trigger-value: 'debug-verify'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-          # Once per hour
-          periodicity: 'H * * * *'
-    os: 'ubuntu2004'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+    os: 'ubuntu2204'
     executor-arch: 'x86_64'
+
 # [end] VPP-DEBUG-X86_64 PROJECT
 
-# VPP-GCC-X86_64 PROJECT
+# VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT
+#
+# Currently a periodic job due to intermittent failures.
+# Limiting branches to master, since other branches
+# may not get fixes for the intermittent failures.
+#
 - project:
-    name: vpp-gcc-x86_64
+    name: vpp-dpdk-rdma-version-mismatch-x86_64
     jobs:
-      - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}'
     project: 'vpp'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+    comment-trigger-value: 'dpdk-rdma-version-mismatch'
+    stream:
+      - 'master':
+          branch: 'master'
+          # Once per day at 00:15
+          periodicity: '15 0 * * 0-6'
+    os: 'ubuntu2204'
     executor-arch: 'x86_64'
-    os: 'ubuntu2004'
+
+# [end] VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT
+
+# VPP-COV-X86_64 PROJECT
+#
+# A per-patch job to produce code coverage.
+#
+# TODO: switch OS to ubuntu-22.04 once the skipping of intermittently failing
+#       tests are removed
+#
+- project:
+    name: vpp-cov-x86_64
+    jobs:
+      - 'vpp-cov-verify-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    make-parallel-jobs: '4'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+    comment-trigger-value: 'gcov-report'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
-# [end] VPP-GCC-X86_64 PROJECT
+          # Once per day at 00:25
+          periodicity: '25 0 * * 0-6'
+    os: 'ubuntu2004'
+    executor-arch: 'x86_64'
+
+# [end] VPP-COV-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
 #
@@ -164,40 +199,27 @@
       - 'vpp-verify-{stream}-{os}-{executor-arch}'
       - 'vpp-merge-{stream}-{os}-{executor-arch}'
     project: 'vpp'
-    make-parallel-jobs: '16'
-    make-test-os: 'ubuntu-20.04'
+    make-parallel-jobs: '4'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: ''
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: ''
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: ''
     os:
-      - centos8
-      - ubuntu1804
       - ubuntu2004
+      - ubuntu2204
     executor-arch: 'aarch64'
-    exclude:
-      # OS deprecated in master
-      - stream: 'master'
-        os: 'centos8'
-      - stream: 'master'
-        os: 'ubuntu1804'
-      # OS deprecated in 2110
-      - stream: '2110'
-        os: 'centos8'
-      # OS deprecated in 2202
-      - stream: '2202'
-        os: 'centos8'
-      - stream: '2202'
-        os: 'ubuntu1804'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -209,27 +231,24 @@
     project: 'vpp'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
     testbed-arch:
-      - 1n-skx:
-          os: 'ubuntu2004'
+      - 1n-spr:
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
+          skip-vote: 'true'
       - 1n-tx2:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'aarch64'
-          skip-vote: 'true'
-
+          skip-vote: 'false'
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
 # VPP-CSIT-VERIFY-PERF PROJECT
@@ -240,49 +259,49 @@
     project: 'vpp'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
     testbed-arch:
       - 2n-icx:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 2n-clx:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
-      - 2n-skx:
-          os: 'ubuntu2004'
+      - 2n-spr:
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 2n-zn2:
-          os: 'ubuntu2004'
-          executor-arch: 'x86_64'
-      - 3n-skx:
-          os: 'ubuntu2004'
-          executor-arch: 'x86_64'
-      - 2n-dnv:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
-      - 3n-dnv:
-          os: 'ubuntu2004'
+      - 3n-icx:
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 3n-tsh:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
+          executor-arch: 'aarch64'
+          make-parallel-jobs: '16'
+      - 3n-alt:
+          os: 'ubuntu2204'
           executor-arch: 'aarch64'
           make-parallel-jobs: '16'
       - 2n-tx2:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'aarch64'
           make-parallel-jobs: '16'
-
+      - 3n-snr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
+      - 3n-icxd:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
+      - 3na-spr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
+      - 3nb-spr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
 # [end] VPP-CSIT-VERIFY-PERF PROJECT
 
 # VPP-CSIT-API-CRC PROJECT
@@ -297,19 +316,17 @@
     executor-arch: 'x86_64'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
-    os: 'ubuntu2004'
+    os:
+      - 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT
 
 # LF RELENG VPP PROJECTS
@@ -383,8 +400,6 @@
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: 'checkstylecheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'docsonly'
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
             - comment-added-contains-event:
@@ -405,8 +420,6 @@
                 - compare-type: REG_EXP
                   pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$
               forbidden-file-paths:
-                - compare-type: REG_EXP
-                  pattern: .*docs\/.*
                 - compare-type: REG_EXP
                   pattern: .*extras\/emacs\/.*
               disable-strict-forbidden-file-verification: 'true'
@@ -440,6 +453,9 @@
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/commitmsg.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/docs_spell.sh
 
     publishers:
       - fdio-infra-publish
@@ -468,6 +484,8 @@
           make-parallel-jobs: '{make-parallel-jobs}'
       - make-test-os-parameter:
           make-test-os: '{make-test-os}'
+      - make-test-multiworker-os-parameter:
+          make-test-multiworker-os: '{make-test-multiworker-os}'
       - os-parameter:
           os: '{os}'
       - project-parameter:
@@ -548,9 +566,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '{periodicity}'
-      - gerrit-trigger-manually-triggered:
-          comment-trigger-value: '{comment-trigger-value}'
+      - gerrit-trigger-checkstyle-nonvoting:
           name: '{project}'
           branch: '{branch}'
 
@@ -570,7 +586,68 @@
 
     publishers:
       - fdio-infra-publish
-# [end] VPP-DEBUG-VERIFY-PERIODIC JOB TEMPLATE
+# [end] VPP-DEBUG-VERIFY JOB TEMPLATE
+
+# VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE
+- job-template:
+    name: 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}'
+
+    project-type: freestyle
+    node: 'builder-{os}-prod-{executor-arch}'
+    concurrent: true
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    # Please keep parameters in alphabetical order
+    parameters:
+      - gerrit-parameter:
+          branch: '{branch}'
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
+      - make-test-os-parameter:
+          make-test-os: '{make-test-os}'
+      - os-parameter:
+          os: '{os}'
+      - project-parameter:
+          project: '{project}'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{periodicity}'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: '{comment-trigger-value}'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/dpdk-rdma-version-mismatch.sh
+
+    publishers:
+      - vpp-dpdk-rdma-version-mismatch:
+          branch: '{branch}'
+      - fdio-infra-publish
+# [end] VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE
 
 # VPP-MERGE JOB TEMPLATE
 - job-template:
@@ -591,6 +668,8 @@
           make-parallel-jobs: '{make-parallel-jobs}'
       - make-test-os-parameter:
           make-test-os: '{make-test-os}'
+      - make-test-multiworker-os-parameter:
+          make-test-multiworker-os: '{make-test-multiworker-os}'
       - os-parameter:
           os: '{os}'
       - project-parameter:
@@ -625,6 +704,9 @@
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/commitmsg.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -702,6 +784,69 @@
       - fdio-infra-publish
 # [end] VPP-GCC-VERIFY JOB TEMPLATE
 
+# VPP-COV-VERIFY JOB TEMPLATE
+- job-template:
+    name: 'vpp-cov-verify-{stream}-{os}-{executor-arch}'
+
+    project-type: freestyle
+    node: 'builder-{os}-prod-{executor-arch}'
+    concurrent: true
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    # Please keep parameters in alphabetical order
+    parameters:
+      - gerrit-parameter:
+          branch: '{branch}'
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
+      - make-test-os-parameter:
+          make-test-os: '{make-test-os}'
+      - os-parameter:
+          os: '{os}'
+      - project-parameter:
+          project: '{project}'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{periodicity}'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: '{comment-trigger-value}'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ext_deps.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/cov-build.sh
+
+    publishers:
+      - fdio-infra-publish-cov-7day
+      - fdio-infra-publish
+# [end] VPP-COV-VERIFY JOB TEMPLATE
+
 # VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}'
@@ -873,9 +1018,6 @@
                 - shell:
                     !include-raw-escape:
                     - ../scripts/vpp/copy_archives.sh
-      - robot-report:
-          output-path: 'archives/csit_current/0/'
-
       - fdio-infra-publish
 # [end] VPP-CSIT-VERIFY-PERF JOB TEMPLATE
 
@@ -939,3 +1081,22 @@
       - fdio-infra-publish
 # [end] VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE
 # [end] JOB TEMPLATE DEFINITIONS
+
+- project:
+    name: vpp-release
+    project: vpp
+    project-name: vpp
+    build-node: centos8-builder-2c-2g
+    mvn-settings: vpp-settings
+    jobs:
+      - "gerrit-packagecloud-release-verify"
+
+- project:
+    name: vpp-packagecloud-release
+    project: vpp
+    project-name: vpp
+    build-node: centos8-builder-2c-2g
+    mvn-settings: vpp-settings
+    jobs:
+      - "gerrit-packagecloud-release-merge"
+      - "{project-name}-gerrit-release-jobs"