X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fdocs.yaml;h=006801f41e7a7c81993a4af0cd119b62d5340bee;hb=7b7ffa99873e679b637ef00a3953ddd1f5a28aae;hp=f8676f6fe104e0227a3cfc706b74852d35b83228;hpb=7c0e2318f7d5bd732005187561bb7b5e422ec70e;p=ci-management.git

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index f8676f6fe..006801f41 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -2,41 +2,24 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
       - 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-docsonly-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-docsonly-merge-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
     executor-arch: 'x86_64'
-    os: 'ubuntu2004'
-
+    os:
+      - 'ubuntu2204'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
-          branch-refspec: ''
-
-# TODO: Remove when stable/2106 and stable/2110 are no longer supported.
-- project:
-    name: make-test-docs
-    jobs:
-      - 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
-      - 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
-
-    project: 'vpp'
-    executor-arch: 'x86_64'
-    os: 'ubuntu2004'
-
-    stream:
-      - '2106':
-          branch: 'stable/2106'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
-      - '2110':
-          branch: 'stable/2110'
+      - '2402':
+          branch: 'stable/2402'
           branch-refspec: ''
 
 - job-template:
@@ -93,6 +76,7 @@
           - ../scripts/vpp/docs.sh
 
     publishers:
+      - fdio-infra-publish-docs-7day
       - fdio-infra-publish
 
 - job-template:
@@ -166,9 +150,8 @@
       - fdio-infra-publish-docs
       - fdio-infra-publish
 
-
 - job-template:
-    name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
+    name: 'vpp-docsonly-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -178,10 +161,6 @@
     only-if-success: true
     default-excludes: false
 
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -205,39 +184,61 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'true'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck-docsonly'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'REG_EXP'
+                  pattern: '.*docs/.*'
+          override-votes: true
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-successful-verified-value: 1
 
     builders:
       - 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
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/make-test-docs.sh
+          - ../scripts/vpp/docs.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/docs_spell.sh
 
     publishers:
+      - fdio-infra-publish-docs-7day
       - fdio-infra-publish
 
 - job-template:
-    name: 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
+    name: 'vpp-docsonly-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
-    concurrent: false
+    concurrent: true
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
     default-excludes: false
 
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -259,36 +260,43 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - reverse:
-          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
-          result: 'success'
       - gerrit:
           server-name: 'Primary'
           trigger-on:
+            - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: 'run-docs'
+                comment-contains-value: 'remerge-docsonly'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'REG_EXP'
+                  pattern: '.*docs/.*'
           skip-vote:
             successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+            failed: false
+            unstable: false
+            notbuilt: false
 
     builders:
       - 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
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/make-test-docs.sh
+          - ../scripts/vpp/docs.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/docs_spell.sh
 
     publishers:
       - fdio-infra-publish-docs