diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2021-05-14 08:14:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-05-14 08:14:24 +0000 |
| commit | 0b054cc53546369a0eaf4a79f08cb4ea3dd6aeab (patch) | |
| tree | 0356de6bcb5ad9672881afae5aee4d62d2fda3a3 /jjb/scripts/vpp/make-test-docs.sh | |
| parent | 60d127c251246b968cad9e96f191576646976a11 (diff) | |
| parent | 5c564cf9b31884034b9137c66967a2b430552219 (diff) | |
Merge "Fix make test docs upload & clean up docs jobs"
Diffstat (limited to 'jjb/scripts/vpp/make-test-docs.sh')
| -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 d20a7b81..1e390a8b 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 |