diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-05-13 16:30:37 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-05-13 16:30:37 -0400 |
| commit | 5c564cf9b31884034b9137c66967a2b430552219 (patch) | |
| tree | e140871210769a388fc0d6947a44f7a8a10202b5 /jjb/scripts/vpp | |
| parent | ab41eb500db92f8c8ae95a0ec7bd6909542696d9 (diff) | |
Fix make test docs upload & clean up docs jobs
- make test DOCS_DIR in vpp/master changed location,
fix upload for master and subsequent release
branches.
- Don't archive docs build output to avoid
stress on nexus
- Sphinx docs are generated and pushed
to github by hand for publishing. Therefore
remove sphinx docs jobs and include building
of sphinx docs in the vpp-docs-verify-* jobs.
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I3b2badbf3e2b242ad6b4efcc7d6d281c8b26136b
Diffstat (limited to 'jjb/scripts/vpp')
| -rwxr-xr-x[-rw-r--r--] | jjb/scripts/vpp/make-test-docs.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/scripts/vpp/make-test-docs.sh b/jjb/scripts/vpp/make-test-docs.sh index d20a7b817..1e390a8b8 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 |