Merge "Configuring minions as single use"

[ci-management.git] / jjb / vpp / include-raw-vpp-docs.sh

diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index def26bc..889037d 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -1,27 +1,19 @@
 #!/bin/bash
 set -xe -o pipefail
-[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/service/local/repositories/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
 [ "$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)
 
-if [ "${GERRIT_BRANCH}" == "stable/1609" ]; then
-  VERSION=16.09
-else
-  echo "************************************"
-  echo "* ${GERRIT_BRANCH} does not publish docs  *"
-  echo "************************************"
-  exit
-fi
-
+make doxygen
 mkdir -p $(dirname ${RESOURCES_DIR})
 mv -f ${DOC_DIR} ${RESOURCES_DIR}
-
-make doxygen
 cd ${SITE_DIR}
+find . -type f '(' -name '*.md5' -o -name '*.dot' -o -name '*.map' ')' -delete
 cat > pom.xml << EOF
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -46,10 +38,10 @@ cat > pom.xml << EOF
   <distributionManagement>
     <site>
       <id>fdio-site</id>
-      <url>dav:${DOCS_REPO_URL}/site/${PROJECT_PATH}/${VERSION}</url>
+      <url>dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION}</url>
     </site>
   </distributionManagement>
 </project>
 EOF
-${MVN} site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}"
+${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
 cd -