X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-docs.sh;h=5ab0df27ebb647e710a180ec5ad9b62bd9ac7a58;hb=4a5e7d24930863698b56af5b31f37f209d618f3f;hp=889037d51f8d067231c00e76e50d5e1844bce4fd;hpb=646fbd49f39198149e8e995b98d2e7c6214d956f;p=ci-management.git diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh index 889037d51..5ab0df27e 100644 --- a/jjb/vpp/include-raw-vpp-docs.sh +++ b/jjb/vpp/include-raw-vpp-docs.sh @@ -10,38 +10,41 @@ set -xe -o pipefail [ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version) make doxygen -mkdir -p $(dirname ${RESOURCES_DIR}) -mv -f ${DOC_DIR} ${RESOURCES_DIR} -cd ${SITE_DIR} -find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete -cat > pom.xml << EOF - - 4.0.0 - io.fd.vpp - docs - 1.0.0 - pom - - false - +if [[ ${JOB_NAME} == *merge* ]]; then + mkdir -p $(dirname ${RESOURCES_DIR}) + mv -f ${DOC_DIR} ${RESOURCES_DIR} + cd ${SITE_DIR} + find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete + cat > pom.xml << EOF + + 4.0.0 + io.fd.vpp + docs + 1.0.0 + pom - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.9 - - - - - - fdio-site - dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} - - - + + false + + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.9 + + + + + + fdio-site + dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} + + + EOF -${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C -cd - + ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + cd - +fi \ No newline at end of file