X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-docs.sh;h=760eaea0615db9b028b9d6c2e536e6e12d1e5368;hb=b2c16f8f806d7123ded6e94f9f11072fa645ace8;hp=4f60b01b5431258223b29d67c4df6e23d4431c30;hpb=28c83c45b31af11362ce8d81bead78b8ba8cad7a;p=ci-management.git
diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 4f60b01b5..760eaea06 100644
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -1,65 +1,50 @@
#!/bin/bash
set -xe -o pipefail
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site/"
+[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
[ "$DOC_FILE" ] || DOC_FILE=vpp.docs.zip
[ "$DOC_DIR" ] || DOC_DIR=build-root/docs/html
-if [ "${GERRIT_BRANCH}" == "stable/1609" ]; then
- VERSION=16.09
-else
- echo "************************************"
- echo "* ${GERRIT_BRANCH} does not publish docs *"
- echo "************************************"
- exit
-fi
-MVN="/opt/apache/maven/bin/mvn"
-
-sudo apt-get install -y zip
+[ "$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}/${VERSION}
-
-
-
-
-
-
-
-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} -B site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
+ cd -
+fi