From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 8 Nov 2017 19:45:37 +0000 (+0000)
Subject: Merge "Add missing packages"
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a43138e041f717211d6b8f20d8d474c810c98174;hp=777ab9620d975b68d6c29112b3c2537649e99029;p=ci-management.git

Merge "Add missing packages"
---

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 50bf999df..0d1f5e049 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -142,7 +142,7 @@ ubuntu_systems() {
     # DEB Install VPP packages to shorten build times
     echo "---> Installing VPP DEB_DEPENDS packages $(date +'%Y%m%dT%H%M%S')"
     VPP_PKGS="curl build-essential autoconf automake bison libssl-dev ccache \
-      debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd \
+      dkms git libtool libganglia1-dev libapr1-dev dh-systemd \
       libconfuse-dev git-review exuberant-ctags cscope indent pkg-config emacs"
     apt install -y ${VPP_PKGS}
 
@@ -160,7 +160,8 @@ ubuntu_systems() {
     echo "---> Installing deb_dpdk packages $(date +'%Y%m%dT%H%M%S')"
     DEB_DPDK_PKGS="google-mock lsb-release dpkg-dev debian-xcontrol devscripts \
       pristine-tar dh-python python-sphinx libpcap0.8-dev libstdc++5 \
-      python-scapy inkscape libxen-dev libxenstore3.0 python-sphinx-rtd-theme"
+      python-scapy inkscape libxen-dev libxenstore3.0 python-sphinx-rtd-theme \
+      python3 python3-sphinx python3-sphinx-rtd-theme libnuma-dev"
     apt install -y ${DEB_DPDK_PKGS}
 
     sudo apt install -y libcap-dev libpcap-dev
@@ -220,8 +221,7 @@ opensuse_systems() {
     # Install openSUSE Python resources and libraries
     echo "--->Installing Python resources & libraries $(date +'%Y%m%dT%H%M%S')"
     OPRL="python-devel python-setuptools python-pip python-wheel python-mock \
-        python3-devel python3-pip python-rpm-macros shadow libnuma-devel \
-        python3"
+        python3-devel python3-pip python-rpm-macros shadow libnuma-devel"
     install_pkgs "$OPRL"
 
     # Install openSUSE Documentation packages
@@ -277,6 +277,9 @@ all_systems() {
     mv /usr/local/bin/packer /usr/local/bin/packer.io
 
     # Install packagecloud.io
+    apt-get update
+    apt-get install ruby-dev
+    gem install rake
     gem install package_cloud
 }