X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-docs.sh;h=5ab0df27ebb647e710a180ec5ad9b62bd9ac7a58;hb=f2a763edbf68175d3a6c1ace9b326272fa34f97d;hp=076004b13c40649d02c80f2b9ee849698e783e12;hpb=ed61c534eea711525913ef3b95c7900b4ead62bf;p=ci-management.git
diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 076004b13..5ab0df27e 100644
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -1,63 +1,50 @@
#!/bin/bash
-set -e
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site/"
+set -xe -o pipefail
+[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
-[ "$DOCS_FILE" ] || DOC_FILE=vpp.docs.zip
+[ "$DOC_FILE" ] || DOC_FILE=vpp.docs.zip
[ "$DOC_DIR" ] || DOC_DIR=build-root/docs/html
-if [ ${BRANCH} == "stable/1609"]; then
- VERSION=16.09
-else
- echo "************************************"
- echo "* ${BRANCH} does not publish docs *"
- echo "************************************"
- exit
-fi
-MVN="/opt/apache/maven/bin/mvn"
+[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site/
+[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources
+[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
+[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
make doxygen
-cd ${DOC_DIR}
-zip ${DOC_FILE} .
-cat pom.xml << EOF
-
- 4.0.0
- io.fd.vpp
- docs
- 1.0.0
- pom
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.8.2
-
- true
-
-
-
- org.sonatype.plugins
- maven-upload-plugin
- 0.0.1
-
-
- publish-site
- deploy
-
- upload-file
-
-
- opendaylight-log-archives
- $DOCS_REPO_URL/content-compressed
- ${DOC_FILE}
- ${PROJECT_PATH}
-
-
-
-
-
-
-
-EOF
-${MVN} deploy -gs $GLOBAL_SETTINGS_FILE -s $SETTINGS_FILE
-cd -
+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
+
+
+ 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 -
+fi
\ No newline at end of file