Add python-pyparsing and correct version

[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 d870aa1..e721d38 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -8,19 +8,15 @@ set -xe -o pipefail
 [ "$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)
+
+sudo apt-get -y install python-pyparsing
 
 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
 <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>
@@ -50,5 +46,5 @@ cat > pom.xml << EOF
   </distributionManagement>
 </project>
 EOF
-${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}"
+${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
 cd -