From 5c564cf9b31884034b9137c66967a2b430552219 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 13 May 2021 16:30:37 -0400 Subject: 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 Change-Id: I3b2badbf3e2b242ad6b4efcc7d6d281c8b26136b --- jjb/scripts/vpp/make-test-docs.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) mode change 100644 => 100755 jjb/scripts/vpp/make-test-docs.sh (limited to 'jjb/scripts/vpp/make-test-docs.sh') diff --git a/jjb/scripts/vpp/make-test-docs.sh b/jjb/scripts/vpp/make-test-docs.sh old mode 100644 new mode 100755 index d20a7b817..1e390a8b8 --- 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 -- cgit 1.2.3-korg