diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-10-06 18:16:17 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-10-26 14:57:03 -0400 |
| commit | 31635358ab5dca1434a82548ba9ae8235441f378 (patch) | |
| tree | 9128f41b1f022da43b9efcc6534baa05152f2ecc /jjb/vpp/docs.yaml | |
| parent | 75e26c58e134d450b19b983ab50b6926b13b120d (diff) | |
Convert VPP docs upload destination from nexus to amazon S3.
- Don't build doxygen docs which is deprecated in master
and fails to upload in 21.xx releases
- Only build 'make test-docs' in 21.xx releases which is
deprecated in master (VPP 22.02)
Change-Id: I54c46b32f95705ee0868a961f18fed8b0d4bba81
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/vpp/docs.yaml')
| -rw-r--r-- | jjb/vpp/docs.yaml | 80 |
1 files changed, 22 insertions, 58 deletions
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index a8139b6b5..3c3322759 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -4,33 +4,46 @@ 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: 'ubuntu2004' stream: - master: branch: 'master' branch-refspec: '' - os: 'ubuntu2004' - '2009': branch: 'stable/2009' branch-refspec: '' - os: 'ubuntu1804' - '2101': branch: 'stable/2101' branch-refspec: '' - os: 'ubuntu1804' - '2106': branch: 'stable/2106' branch-refspec: '' - os: 'ubuntu1804' - '2110': branch: 'stable/2110' branch-refspec: '' - os: 'ubuntu1804' + +# 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' + branch-refspec: '' + - '2110': + branch: 'stable/2110' + branch-refspec: '' - job-template: name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}' @@ -54,8 +67,6 @@ branch: '{branch}' - os-parameter: os: '{os}' - - maven-exec: - maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' - gerrit-refspec-parameter: @@ -77,16 +88,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 @@ -96,9 +97,6 @@ - shell: !include-raw-escape: - ../scripts/vpp/docs.sh - - shell: - !include-raw-escape: - - ../scripts/vpp/sphinx-docs.sh publishers: - fdio-infra-publish @@ -125,8 +123,6 @@ branch: '{branch}' - os-parameter: os: '{os}' - - maven-exec: - maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' @@ -162,16 +158,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 @@ -183,6 +169,7 @@ - ../scripts/vpp/docs.sh publishers: + - fdio-infra-publish-docs - fdio-infra-publish @@ -208,8 +195,6 @@ branch: '{branch}' - os-parameter: os: '{os}' - - maven-exec: - maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' - gerrit-refspec-parameter: @@ -231,16 +216,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 @@ -276,8 +251,6 @@ branch: '{branch}' - os-parameter: os: '{os}' - - maven-exec: - maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' @@ -313,16 +286,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 @@ -334,4 +297,5 @@ - ../scripts/vpp/make-test-docs.sh publishers: + - fdio-infra-publish-docs - fdio-infra-publish |