summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-09-08 16:58:23 -0700
committerEd Warnicke <eaw@cisco.com>2016-09-08 16:58:23 -0700
commit28c83c45b31af11362ce8d81bead78b8ba8cad7a (patch)
treeb6350bc177f6d6e046193695ad3412c08b0daf6b
parent7bfcbf97135763827a50c45b6a30c4da999dba2a (diff)
Add zip to allow for vpp-docs job to work
Change-Id: Ie47108339da67afb9000ef5ac3024d379f490642 Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r--jjb/vpp/include-raw-vpp-docs.sh2
-rw-r--r--vagrant/lib/bootstrap-functions.sh3
2 files changed, 5 insertions, 0 deletions
diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 0619a8687..4f60b01b5 100644
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -14,6 +14,8 @@ else
fi
MVN="/opt/apache/maven/bin/mvn"
+sudo apt-get install -y zip
+
make doxygen
cd ${DOC_DIR}
zip ${DOC_FILE} .
diff --git a/vagrant/lib/bootstrap-functions.sh b/vagrant/lib/bootstrap-functions.sh
index 68d25517d..4bd8d03f9 100644
--- a/vagrant/lib/bootstrap-functions.sh
+++ b/vagrant/lib/bootstrap-functions.sh
@@ -139,6 +139,9 @@ deb_install_pkgs() {
# Install virtualenv for test execution
PACKAGES="$PACKAGES python-virtualenv python-pip python-dev"
+ # Install to allow the vpp-docs job to zip up docs to push them
+ PACKAGES="$PACKAGES zip"
+
echo '---> Installing packages'
# disable double quoting check
# shellcheck disable=SC2086