X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-make-test-docs.sh;h=9860e00bb994e95cb5f7451822312f9bca839a56;hb=5ab0fdb7a444961a521900b5b826e1015e28b6f7;hp=8b32ccef19d32422da56926be05a7970be0ddd6a;hpb=ebd839d8029ced6ad18adedd91ed2caa0973e30e;p=ci-management.git diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh index 8b32ccef1..9860e00bb 100644 --- a/jjb/vpp/include-raw-vpp-make-test-docs.sh +++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh @@ -1,10 +1,10 @@ #!/bin/bash set -xe -o pipefail [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" -[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp_make_test -[ "$DOC_DIR" ] || DOC_DIR=build-root/test-doc/build/html +[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp +[ "$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 +[ "$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) @@ -18,7 +18,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then cat > pom.xml << EOF 4.0.0 - io.fd.vpp_make_test + io.fd.vpp docs 1.0.0 pom @@ -44,6 +44,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then EOF - ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + ${MVN} -B site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C cd - fi