Merge "vpp-hst: add VPP HostStack Test framework jobs"

[ci-management.git] / jjb / vpp / docs.yaml

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 6965995..1ee98ba 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -2,36 +2,28 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
       - 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
-      - '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: 'ubuntu1804'
-
-    stream:
-      - master:
-          branch: 'master'
-      - '2009':
-          branch: 'stable/2009'
-      - '2101':
-          branch: 'stable/2101'
-
-- project:
-    name: sphinx
-    jobs:
-      - 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
-      - 'vpp-sphinx-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: 'ubuntu1804'
-
+    os:
+      - 'ubuntu2204'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
+          branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
+      - '2402':
+          branch: 'stable/2402'
+          branch-refspec: ''
+      - '2406':
+          branch: 'stable/2406'
+          branch-refspec: ''
 
 - job-template:
     name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
@@ -44,11 +36,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -57,11 +47,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -79,16 +68,6 @@
           branch: '{branch}'
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
@@ -100,8 +79,8 @@
           - ../scripts/vpp/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - fdio-infra-publish-docs-7day
+      - fdio-infra-publish
 
 - job-template:
     name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
@@ -109,17 +88,14 @@
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -128,13 +104,8 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -168,16 +139,6 @@
             notbuilt: true
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - shell:
           !include-raw-escape:
           - ../scripts/setup_executor_env.sh
@@ -189,11 +150,11 @@
           - ../scripts/vpp/docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - fdio-infra-publish-docs
+      - fdio-infra-publish
 
 - job-template:
-    name: 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
+    name: 'vpp-docsonly-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -203,12 +164,6 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -216,11 +171,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -236,214 +190,58 @@
       - 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: 'run-sphinx-docs-verify'
+                comment-contains-value: 'recheck-docsonly'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+              file-paths:
+                - compare-type: 'REG_EXP'
+                  pattern: '.*docs/.*'
+          override-votes: true
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-successful-verified-value: 1
 
     builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - 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/vpp/sphinx-docs.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
-
-- job-template:
-    name: 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
-
-    project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
-    concurrent: false
-    archive-artifacts: 'docs/_build/html/*'
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-sphinx-docs-merged'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_executor_env.sh
+          - ../scripts/vpp/commitmsg.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/sphinx-docs.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
-
-- job-template:
-    name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
-
-    project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
-    concurrent: true
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-      - gerrit-refspec-parameter
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_executor_env.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+          - ../scripts/vpp/docs.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/make-test-docs.sh
+          - ../scripts/vpp/docs_spell.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - 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
-    archive-artifacts: '**/build-root/build-test/doc/html/*'
+    concurrent: true
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -451,14 +249,8 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -471,47 +263,44 @@
           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:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
       - 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-shiplogs:
-          maven-version: 'mvn36'
+      - fdio-infra-publish-docs
+      - fdio-infra-publish