Include python development for Ubuntu images

Building netifaces extension requires headers from
python-dev, without which pip install fails.

Move all python deps into baseline for Ubuntu and
CentOS images

Jira: releng-182
Change-Id: I9828d3c0aa855651e0daeb63b8451c9e041a3177
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 23101220e1663d761bd319a9ffcb31688818bbfe..f96ee5debd32745b7c46084e121160df1b822147 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -216,6 +216,13 @@ EOF
     # Install sysstat
     yum install -y sysstat
     enable_service sysstat
+
+    # Install python3 and dependencies, needed for Coala linting at least
+    yum install -y python34
+    yum install -y python34-{devel,virtualenv,setuptools,pip}
+
+    # Install python dependencies, useful generally
+    yum install -y python-{devel,virtualenv,setuptools,pip}
 }
 
 ubuntu_systems() {
@@ -321,6 +328,13 @@ EOF
     apt-get install haveged
     update-rc.d haveged defaults
 
+    # Install python3 and dependencies, needed for Coala linting at least
+    ensure_ubuntu_install python3
+    ensure_ubuntu_install python3-{dev,virtualenv,setuptools,pip}
+
+    # Install python and dependencies
+    ensure_ubuntu_install python-{dev,virtualenv,setuptools,pip}
+
     # disable unattended upgrades & daily updates
     echo '---> Disabling automatic daily upgrades'
     sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodic

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index 1329177429f6d37959f1db4492605063550f9137..6f8f6121b8380a7d04ed80151d2c8c13b911bc76 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -12,13 +12,6 @@ yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     {readline,unixODBC}-devel yum-utils fedora-packager \
     libxslt-devel crudini
 
-# Install python3 and dependencies, needed for Coala linting at least
-yum install -y python34
-yum install -y python34-{devel,virtualenv,setuptools,pip}
-
-# Install python dependencies, useful generally
-yum install -y python-{devel,virtualenv,setuptools,pip}
-
 # Needed by autorelease scripts
 yum install -y xmlstarlet
 

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 5f392cf8a15c69c97839144fa0edd6bb26d0e19b..4afb693411b92e81bfed2e27cd01cbd0dcb5d81e 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -39,9 +39,6 @@ cp cbench /usr/local/bin/
 echo '---> Installing exabgp'
 apt-get install exabgp
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install python-virtualenv python-pip
-
 # Install vlan for vlan based tests in VTN suites
 apt-get install vlan
 

diff --git a/packer/provision/mininet.sh b/packer/provision/mininet.sh
index 0e7efcb37dfa7b1f8155222705f73a31ebdca1b6..9274388204f752c3f592037f72b34cbe3edc9d6e 100644 (file)
--- a/packer/provision/mininet.sh
+++ b/packer/provision/mininet.sh
@@ -69,8 +69,5 @@ make install
 echo '---> Installing vlan for vlan based tests in VTN suites'
 apt-get install -y --force-yes vlan
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install -y --force-yes python-virtualenv python-pip
-
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install -y --force-yes -qq python-netaddr