From 3427e2c8369173ed9f1daeeb59068281e2acbb8d Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 24 Mar 2023 15:47:55 -0400 Subject: Add vpp docs only CI jobs - Also, run commitmsg.sh for all vpp merge jobs to ensure manually verified merged changes conform to commit message format. Change-Id: I68180b35efbfc7de91d627e21ed96501d28a6e75 Signed-off-by: Dave Wallace --- jjb/vpp/docs.yaml | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++- jjb/vpp/vpp.yaml | 5 +- 2 files changed, 163 insertions(+), 3 deletions(-) diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 9776217bb..e80a46656 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -2,8 +2,10 @@ - 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' @@ -159,3 +161,160 @@ publishers: - fdio-infra-publish-docs - fdio-infra-publish + +- job-template: + name: 'vpp-docsonly-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 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - stream-parameter: + stream: '{stream}' + - gerrit-refspec-parameter: + refspec: '{branch-refspec}' + + 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: + 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 + skip-vote: + successful: 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/docs.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh + + publishers: + - fdio-infra-publish-docs-7day + - fdio-infra-publish + +- job-template: + name: 'vpp-docsonly-merge-{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 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - stream-parameter: + stream: '{stream}' + + 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: + - change-merged-event + - comment-added-contains-event: + 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: 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/docs.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/docs_spell.sh + + publishers: + - fdio-infra-publish-docs + - fdio-infra-publish diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index ade616235..472779370 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -382,8 +382,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: @@ -688,6 +686,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 -- cgit 1.2.3-korg