Indent package for opensuse Leap 42.3

[ci-management.git] / packer / provision / basebuild.sh

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 50bf999..75b9148 100644 (file)
--- 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,9 @@ 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 \
+      libibverbs-dev"
     apt install -y ${DEB_DPDK_PKGS}
 
     sudo apt install -y libcap-dev libpcap-dev
@@ -214,14 +216,13 @@ opensuse_systems() {
 
     # Install openSUSE Packaging utilities and resources
     echo "--->Installing PKG utilities & resources $(date +'%Y%m%dT%H%M%S')"
-    OPP="yum-utils"
+    OPP="yum-utils rpm-build"
     install_pkgs "$OPP"
 
     # 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
@@ -257,6 +258,14 @@ opensuse_systems() {
     # minimum so installing from TW repo
     zypper install -y \
         https://download.opensuse.org/tumbleweed/repo/oss/suse/x86_64/nasm-2.13.01-2.2.x86_64.rpm
+
+    # Leap 42.3 does not have a recent INDENT version
+    # Other distros in Jenkins run 2.2.11 so let's align Leap 42.3 too to avoid
+    # build checks differences and false-positives
+    zypper --non-interactive --gpg-auto-import-keys ar \
+       https://download.opensuse.org/repositories/devel:/tools/openSUSE_Leap_42.3/devel:tools.repo
+    zypper --gpg-auto-import-keys ref
+    zypper install -y indent
 }
 
 all_systems() {
@@ -277,6 +286,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
 }