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 af9a50f..889037d 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -7,15 +7,7 @@ set -xe -o pipefail
 [ "$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"
-
-if [ "${GERRIT_BRANCH}" == "stable/1609" ]; then
-  VERSION=16.09
-else
-  echo "************************************"
-  echo "* ${GERRIT_BRANCH} does not publish docs  *"
-  echo "************************************"
-  exit
-fi
+[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
 
 make doxygen
 mkdir -p $(dirname ${RESOURCES_DIR})
@@ -46,7 +38,7 @@ 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>