Merge "Update Ubuntu 1404 with 1604 mininet-ovs-25 images"

[releng/builder.git] / packer / provision / baseline.sh

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 23101220e1663d761bd319a9ffcb31688818bbfe..e5f727f5a4e57eb6c08a0aadae892e42edb972a6 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() {
@@ -262,23 +269,35 @@ EOF
 
     ensure_ubuntu_install unzip xz-utils puppet git libxml-xpath-perl
 
-    # install Java 7
-    echo "---> Configuring OpenJDK"
+    # Install python3 and dependencies, needed for Coala linting
+    ensure_ubuntu_install python3
+    ensure_ubuntu_install python3-{dev,setuptools,pip}
+
+    # Install python and dependencies
+    ensure_ubuntu_install python-{dev,virtualenv,setuptools,pip}
+
     FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
     case "$FACTER_OSVER" in
         14.04)
+            echo "---> Installing OpenJDK"
             apt-get install openjdk-7-jdk
             # make jdk8 available
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
             # We need to force openjdk-8-jdk to install
             apt-get install openjdk-8-jdk
+            echo "---> Configuring OpenJDK"
             # make sure that we still default to openjdk 7
             update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
             update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
         ;;
         16.04)
+            echo "---> Installing OpenJDK"
             apt-get install openjdk-8-jdk
+
+            echo "---> Installing python3 virtualenv"
+            # python3-virtualenv is available starting with 16.04.
+            ensure_ubuntu_install python3-virtualenv
         ;;
         *)
             echo "---> Unknown Ubuntu version $FACTER_OSVER"