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 3431186..4b3a132 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -40,17 +40,20 @@
       - '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: ''
     executor-arch: 'x86_64'
     exclude:
+      # os deprecated in 23.06
+      - stream: '2306'
+        os: 'ubuntu2004'
       # os deprecated in 23.02
       - stream: '2302'
         os: 'ubuntu2004'
@@ -60,9 +63,7 @@
       # 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,11 +88,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
-          make-test-multiworker-os: 'debian-11'
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -102,15 +98,16 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
+          make-test-multiworker-os: 'debian-11'
     os:
       - debian11
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'x86_64'
-    exclude:
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
@@ -175,16 +172,19 @@
       - '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: ''
     exclude:
+      # os deprecated in 23.06
+      - stream: '2306'
+        os: 'ubuntu2004'
       # os deprecated in 23.02
       - stream: '2302'
         os: 'ubuntu2004'
@@ -194,9 +194,6 @@
       # os deprecated in master
       - stream: 'master'
         os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -221,11 +218,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
-          make-test-multiworker-os: ''
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -236,14 +228,15 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
+          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: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -253,25 +246,25 @@
       - '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'
-          branch-refspec: ''
       - '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'
-          skip-vote: 'false'
+          skip-vote: 'true'
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
 # VPP-CSIT-VERIFY-PERF PROJECT
@@ -292,6 +285,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'
@@ -330,12 +326,12 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''
+      - '2306':
+          branch: 'stable/2306'
+          branch-refspec: ''
     os:
       - 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT
@@ -411,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:
@@ -717,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
@@ -965,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