X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=b73e48810b2298faff5ab3b31f026422068d9e79;hb=545524a45de433fd5652701cbe69b79d08cfb1cf;hp=fa3d7e072b631093d6a19591d9bac03f9f14e9e8;hpb=bc8c27babb56a3f446a67508ec3afe87afb86d53;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fa3d7e072..b73e48810 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 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:
@@ -40,29 +40,30 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     executor-arch: 'x86_64'
     exclude:
+      # os deprecated in 23.10
+      - stream: '2310'
+        os: 'ubuntu2004'
+      # os deprecated in 23.06
+      - stream: '2306'
+        os: 'ubuntu2004'
       # os deprecated in 23.02
       - stream: '2302'
         os: 'ubuntu2004'
-      # os deprecated in 22.10
-      - stream: '2210'
-        os: 'ubuntu2004'
       # os deprecated in master
       - stream: 'master'
         os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
+
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
 # VPP-X86_64 PROJECT
@@ -87,18 +88,18 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2206':
-          branch: 'stable/2206'
+      - '2302':
+          branch: 'stable/2302'
           branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2210':
-          branch: 'stable/2210'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2302':
-          branch: 'stable/2302'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
@@ -107,12 +108,48 @@
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'x86_64'
-    exclude:
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [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:
+      - ubuntu2004
+      - ubuntu2204
+    executor-arch: 'x86_64'
+    stream:
+      - 'master':
+          branch: 'master'
+          branch-refspec: ''
+      - '2302':
+          branch: 'stable/2302'
+          branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
+    exclude:
+      # os deprecated in 23.10
+      - stream: '2310'
+        os: 'ubuntu2004'
+      # os deprecated in 23.06
+      - stream: '2306'
+        os: 'ubuntu2004'
+      # os deprecated in 23.02
+      - stream: '2302'
+        os: 'ubuntu2004'
+      # os deprecated in master
+      - stream: 'master'
+        os: 'ubuntu2004'
+
+# [end] VPP-GCC-X86_64 PROJECT
+
 # VPP-DEBUG-X86_64 PROJECT
 #
 # Currently a periodic job due to intermittent failures.
@@ -160,44 +197,31 @@
 
 # [end] VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT
 
-# VPP-GCC-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-gcc-x86_64
+    name: vpp-cov-x86_64
     jobs:
-      - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-cov-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     make-parallel-jobs: '4'
-    os:
-      - ubuntu2004
-      - ubuntu2204
-    executor-arch: 'x86_64'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+    comment-trigger-value: 'gcov-report'
     stream:
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
-    exclude:
-      # os deprecated in 23.02
-      - stream: '2302'
-        os: 'ubuntu2004'
-      # os deprecated in 22.10
-      - stream: '2210'
-        os: 'ubuntu2004'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
-# [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
 #
@@ -221,18 +245,18 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2206':
-          branch: 'stable/2206'
+      - '2302':
+          branch: 'stable/2302'
           branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2210':
-          branch: 'stable/2210'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2302':
-          branch: 'stable/2302'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
@@ -240,10 +264,6 @@
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'aarch64'
-    exclude:
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -258,16 +278,20 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     testbed-arch:
-      - 1n-skx:
+      - 1n-spr:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
+          skip-vote: 'true'
       - 1n-tx2:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
@@ -292,6 +316,9 @@
       - 2n-clx:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
+      - 2n-spr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
       - 2n-zn2:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
@@ -313,6 +340,12 @@
       - 3n-snr:
           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
@@ -330,31 +363,17 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     os:
-      - 'ubuntu2004'
       - 'ubuntu2204'
-    exclude:
-      # os deprecated in 23.02
-      - stream: '2302'
-        os: 'ubuntu2004'
-      # os deprecated in 22.10
-      - stream: '2210'
-        os: 'ubuntu2004'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT
 
 # LF RELENG VPP PROJECTS
@@ -428,8 +447,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:
@@ -616,7 +633,7 @@
 
     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:
@@ -734,6 +751,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
@@ -811,6 +831,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}'
@@ -982,9 +1065,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
 
@@ -1048,3 +1128,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"