X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=78673cd0477801af4fce81a1292451ddb60ab4bf;hb=d42f7cba3ef295eebcb0496247e8a9076c6bf7a2;hp=ed470580d1528ab97d7b101d21b6162f5c107c5b;hpb=60ec179c18d8b09d8a2ee3b5f763581613e52a68;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index ed470580d..78673cd04 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) 2022 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:
@@ -38,11 +38,11 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     executor-arch: 'x86_64'
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
@@ -68,27 +68,21 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     os:
-      - centos8
       - debian10
-      - ubuntu1804
+      - debian11
       - ubuntu2004
     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 added in 22.06
+      - stream: '2202'
+        os: 'debian11'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
@@ -127,11 +121,11 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
 # [end] VPP-GCC-X86_64 PROJECT
 
@@ -156,56 +150,34 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     os:
-      - centos8
-      - ubuntu1804
       - ubuntu2004
     executor-arch: 'aarch64'
-    exclude:
-      # OS deprecated in master
-      - stream: 'master'
-        os: 'centos8'
-      - stream: 'master'
-        os: 'ubuntu1804'
-      # OS deprecated in 2110
-      - stream: '2110'
-        os: 'centos8'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
 - project:
     name: vpp-csit-verify-device
     jobs:
-      - 'vpp-csit-verify-device-perpatch':
-          make-parallel-jobs: '32'
-          exclude:
-            - testbed-arch: '1n-tx2'
-      - 'vpp-csit-verify-device-periodic':
+      - 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}':
           make-parallel-jobs: '32'
-          periodicity: 'H * * * *'
-          skip-vote: 'true'
-          comment-trigger-value: 'devicetest-periodic'
-          exclude:
-            - stream: '2106'
-            - stream: '2110'
-            - testbed-arch: '1n-skx'
     project: 'vpp'
     skip-vote: 'false'
     stream:
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     testbed-arch:
       - 1n-skx:
@@ -214,6 +186,7 @@
       - 1n-tx2:
           os: 'ubuntu2004'
           executor-arch: 'aarch64'
+          skip-vote: 'true'
 
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
@@ -228,23 +201,23 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     testbed-arch:
-      - 2n-clx:
+      - 2n-icx:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
-      - 2n-skx:
+      - 2n-clx:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
       - 2n-zn2:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
-      - 3n-skx:
+      - 3n-icx:
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
       - 2n-dnv:
@@ -257,6 +230,10 @@
           os: 'ubuntu2004'
           executor-arch: 'aarch64'
           make-parallel-jobs: '16'
+      - 3n-alt:
+          os: 'ubuntu2004'
+          executor-arch: 'aarch64'
+          make-parallel-jobs: '16'
       - 2n-tx2:
           os: 'ubuntu2004'
           executor-arch: 'aarch64'
@@ -279,11 +256,11 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
+      - '2202':
+          branch: 'stable/2202'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2206':
+          branch: 'stable/2206'
           branch-refspec: ''
     os: 'ubuntu2004'
 # [end] VPP-CSIT-API-CRC PROJECT
@@ -381,8 +358,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'
@@ -416,6 +391,9 @@
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/commitmsg.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/docs_spell.sh
 
     publishers:
       - fdio-infra-publish
@@ -678,88 +656,9 @@
       - fdio-infra-publish
 # [end] VPP-GCC-VERIFY JOB TEMPLATE
 
-# VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE
-- job-template:
-    name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}'
-    id: 'vpp-csit-verify-device-periodic'
-    description: |
-      <ul>
-          <li>executor
-              <ul>
-                  <li>csit-builder-{os}-prod-{executor-arch}
-              </ul>
-          <li>testbed architecture
-              <ul>
-                  <li>{testbed-arch}
-              </ul>
-      </ul>
-
-    project-type: freestyle
-    node: 'csit-builder-{os}-prod-{executor-arch}'
-    concurrent: true
-    latest-only: false
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
-    # Please keep parameters in alphabetical order
-    parameters:
-      - gerrit-csit-refspec-parameter
-      - gerrit-event-comment-text-parameter
-      - gerrit-event-type-parameter
-      - gerrit-parameter:
-          branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '{branch-refspec}'
-      - make-parallel-jobs-parameter:
-          make-parallel-jobs: '{make-parallel-jobs}'
-      - os-parameter:
-          os: '{os}'
-      - project-parameter:
-          project: '{project}'
-      - stream-parameter:
-          stream: '{stream}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '90'
-
-    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/csit-device.sh
-
-    publishers:
-      - fdio-infra-publish
-# [end] VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE
-
 # VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{os}-{executor-arch}-{testbed-arch}'
-    id: 'vpp-csit-verify-device-perpatch'
     description: |
       <ul>
           <li>executor