summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2021-05-14 08:14:24 +0000
committerGerrit Code Review <gerrit@fd.io>2021-05-14 08:14:24 +0000
commit0b054cc53546369a0eaf4a79f08cb4ea3dd6aeab (patch)
tree0356de6bcb5ad9672881afae5aee4d62d2fda3a3
parent60d127c251246b968cad9e96f191576646976a11 (diff)
parent5c564cf9b31884034b9137c66967a2b430552219 (diff)
Merge "Fix make test docs upload & clean up docs jobs"
-rwxr-xr-x[-rw-r--r--]jjb/scripts/vpp/make-test-docs.sh7
-rw-r--r--jjb/vpp/docs.yaml189
2 files changed, 9 insertions, 187 deletions
diff --git a/jjb/scripts/vpp/make-test-docs.sh b/jjb/scripts/vpp/make-test-docs.sh
index d20a7b8..1e390a8 100644..100755
--- a/jjb/scripts/vpp/make-test-docs.sh
+++ b/jjb/scripts/vpp/make-test-docs.sh
@@ -28,17 +28,22 @@ fi
DOCS_REPO_URL=${DOCS_REPO_URL:-"https://nexus.fd.io/content/sites/site"}
PROJECT_PATH=${PROJECT_PATH:-"io/fd/vpp"}
-DOC_DIR=${DOC_DIR:-"build-root/build-test/doc/html"}
+DOC_DIR=${DOC_DIR:-"test/doc/build/html"}
SITE_DIR=${SITE_DIR:-"build-root/docs/deploy-site"}
RESOURCES_DIR=${RESOURCES_DIR:-"${SITE_DIR}/src/site/resources/vpp_make_test"}
MVN=${MVN:-"/opt/apache/maven/bin/mvn"}
VERSION=${VERSION:-"$(./build-root/scripts/version rpm-version)"}
+if [[ ${JOB_NAME} == *2009* ]] || [[ ${JOB_NAME} == *2101* ]] ; then
+ DOC_DIR="build-root/build-test/doc/html"
+fi
+
make test-doc
if [[ ${JOB_NAME} == *merge* ]]; then
mkdir -p ${RESOURCES_DIR}
mv -f ${DOC_DIR} ${RESOURCES_DIR}
+ ls -alR ${RESOURCES_DIR}
cd ${SITE_DIR}
cat > pom.xml << EOF
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index f58ee2a..ee67190 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -24,21 +24,6 @@
branch-refspec: ''
os: 'ubuntu1804'
-- project:
- name: sphinx
- jobs:
- - 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
- - 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
-
- project: 'vpp'
- executor-arch: 'x86_64'
- os: 'ubuntu2004'
-
- stream:
- - master:
- branch: 'master'
- branch-refspec: ''
-
- job-template:
name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
@@ -105,6 +90,9 @@
- shell:
!include-raw-escape:
- ../scripts/vpp/docs.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/sphinx-docs.sh
publishers:
- fdio-infra-publish
@@ -115,7 +103,6 @@
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
@@ -138,9 +125,6 @@
maven-version: 'mvn33-new'
- stream-parameter:
stream: '{stream}'
- - string:
- name: ARCHIVE_ARTIFACTS
- description: Artifacts to archive to the logs server.
scm:
- gerrit-trigger-scm:
@@ -197,168 +181,6 @@
publishers:
- fdio-infra-publish
-- job-template:
- name: 'vpp-sphinx-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:
- 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:
- - comment-added-contains-event:
- comment-contains-value: 'run-sphinx-docs-verify'
- 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
-
- 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-publish
-
-- 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
- - shell:
- !include-raw-escape:
- - ../scripts/setup_vpp_ubuntu_docker_test.sh
- - shell:
- !include-raw-escape:
- - ../scripts/vpp/sphinx-docs.sh
-
- publishers:
- - fdio-infra-publish
- job-template:
name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
@@ -436,7 +258,6 @@
project-type: freestyle
node: 'builder-{os}-prod-{executor-arch}'
concurrent: false
- archive-artifacts: '**/build-root/build-test/doc/html/*'
allow-empty: 'true'
fingerprint: false
only-if-success: true
@@ -459,10 +280,6 @@
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: