Code Review / ci-management.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Skip voting on vpp-csit-verify-device-* jobs
[ci-management.git] / jjb / vpp / vpp.yaml
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index cdda5bc..4b3a132 100644 (file)
--- 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: ''
-      - '2202':
-          branch: 'stable/2202'
-          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: ''
     executor-arch: 'x86_64'
     exclude:
+      # 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: '2202'
-        os: 'ubuntu2204'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
+
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
 # VPP-X86_64 PROJECT
@@ -85,48 +86,28 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-          make-test-os: 'ubuntu-22.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2202':
-          branch: 'stable/2202'
+      - '2210':
+          branch: 'stable/2210'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.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'
     os:
-      - debian10
       - debian11
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'x86_64'
-    exclude:
-      # os deprecated in 22.06
-      - stream: '2206'
-        os: 'debian10'
-      # os deprecated in 22.10
-      - stream: '2210'
-        os: 'debian10'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'debian10'
-      # os added in 22.06
-      - stream: '2202'
-        os: 'debian11'
-      # os added in 22.10
-      - stream: '2202'
-        os: 'ubuntu2204'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
@@ -141,13 +122,13 @@
       - 'vpp-debug-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     make-parallel-jobs: '4'
-    make-test-os: 'ubuntu-22.04'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
     comment-trigger-value: 'debug-verify'
     stream:
       - 'master':
           branch: 'master'
           branch-refspec: ''
-          make-test-os: 'ubuntu-22.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
     os: 'ubuntu2204'
     executor-arch: 'x86_64'
 
@@ -164,7 +145,7 @@
     jobs:
       - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}'
     project: 'vpp'
-    make-test-os: 'ubuntu-22.04'
+    make-test-os: 'ubuntu-20.04 ubuntu-22.04'
     comment-trigger-value: 'dpdk-rdma-version-mismatch'
     stream:
       - 'master':
@@ -191,28 +172,28 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          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: ''
     exclude:
+      # 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: '2202'
-        os: 'ubuntu2204'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -235,34 +216,27 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-          make-test-os: 'ubuntu-22.04'
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2202':
-          branch: 'stable/2202'
+      - '2210':
+          branch: 'stable/2210'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.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: ''
     os:
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'aarch64'
-    exclude:
-      # os added in 22.10
-      - stream: '2202'
-        os: 'ubuntu2204'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -272,18 +246,21 @@
       - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}':
           make-parallel-jobs: '32'
     project: 'vpp'
-    skip-vote: 'false'
     stream:
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
+      - '2302':
+          branch: 'stable/2302'
+          branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
     testbed-arch:
       - 1n-skx:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
+          skip-vote: 'true'
       - 1n-tx2:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
@@ -308,16 +285,13 @@
       - 2n-clx:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
-      - 2n-zn2:
-          os: 'ubuntu2204'
-          executor-arch: 'x86_64'
-      - 3n-icx:
+      - 2n-spr:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
-      - 2n-dnv:
+      - 2n-zn2:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
-      - 3n-dnv:
+      - 3n-icx:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 3n-tsh:
@@ -352,31 +326,14 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
+      - '2302':
+          branch: 'stable/2302'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
+      - '2306':
+          branch: 'stable/2306'
           branch-refspec: ''
     os:
-      - 'ubuntu2004'
       - 'ubuntu2204'
-    exclude:
-      # os deprecated in 22.10
-      - stream: '2210'
-        os: 'ubuntu2004'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2202'
-        os: 'ubuntu2204'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT
 
 # LF RELENG VPP PROJECTS
@@ -450,8 +407,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:
@@ -756,6 +711,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
@@ -1004,9 +962,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
 
Management repo for Jenkins Job Builder, script and management related to the Jenkins CI configuration.