Add python-pyparsing and correct version

Change-Id: I92185b842e0c3d1789e1d49293bcd831281bb541
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index c3551c7..e721d38 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -8,7 +8,9 @@ set -xe -o pipefail
 [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
 
-[ "$VERSION" ] || VERSION=$(./build-root/scripts/version --rpm-version)
+[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
+
+sudo apt-get -y install python-pyparsing
 
 make doxygen
 mkdir -p $(dirname ${RESOURCES_DIR})

diff --git a/vagrant/lib/bootstrap-functions.sh b/vagrant/lib/bootstrap-functions.sh
index 4bd8d03..9a60678 100644 (file)
--- a/vagrant/lib/bootstrap-functions.sh
+++ b/vagrant/lib/bootstrap-functions.sh
@@ -148,7 +148,7 @@ deb_install_pkgs() {
     apt-get install ${PACKAGES}
 
     # Specify documentation packages
-    DOC_PACKAGES="doxygen graphviz"
+    DOC_PACKAGES="doxygen graphviz python-pyparsing"
     apt-get install ${DOC_PACKAGES}
 }