Do not run apt-get update in spinup script

Also move installers to provision scripts.

Change-Id: Iee1d260a74ea50e196792ff9e6ff1db760c95eae
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jenkins-scripts/mininet-ubuntu.sh b/jenkins-scripts/mininet-ubuntu.sh
index 55cb2cd091d39269554f2cad9a3c411f3f7bf89e..0b925bb29b7b1285db0b50427cf6a90483398c29 100755 (executable)
--- a/jenkins-scripts/mininet-ubuntu.sh
+++ b/jenkins-scripts/mininet-ubuntu.sh
@@ -8,12 +8,3 @@ EOF
 
 # disable the firewall
 /bin/bash ./disable_firewall.sh
-
-# Make sure apt-get database is up-to-date
-apt-get update -y --force-yes -qq
-
-# Install vlan for vlan based tests in VTN suites
-apt-get install -y --force-yes -qq vlan
-
-# Install netaddr package which is needed by some custom mininet topologies
-apt-get install -y --force-yes -qq python-netaddr

diff --git a/packer/provision/mininet-ovs-2.3.sh b/packer/provision/mininet-ovs-2.3.sh
index 07806a7ed2280b7c32169b0bf5e95a34bd6f6313..336c67b6936cc7a200b087a419f5ea7bd8304d39 100644 (file)
--- a/packer/provision/mininet-ovs-2.3.sh
+++ b/packer/provision/mininet-ovs-2.3.sh
@@ -76,3 +76,9 @@ apt-get install -y --force-yes exabgp
 
 echo '---> All Python package installation should happen in virtualenv'
 apt-get install -y --force-yes python-virtualenv python-pip
+
+# Install vlan for vlan based tests in VTN suites
+apt-get install -y --force-yes -qq vlan
+
+# Install netaddr package which is needed by some custom mininet topologies
+apt-get install -y --force-yes -qq python-netaddr

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 8dfb387a52b832e06d9aa05e71749503d39c052a..a3d1e423df9957fec48b5f6d3c8974cb9b441a18 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -39,3 +39,9 @@ apt-get install -y --force-yes exabgp
 
 echo '---> All Python package installation should happen in virtualenv'
 apt-get install -y --force-yes python-virtualenv python-pip
+
+# Install vlan for vlan based tests in VTN suites
+apt-get install -y --force-yes -qq vlan
+
+# Install netaddr package which is needed by some custom mininet topologies
+apt-get install -y --force-yes -qq python-netaddr

diff --git a/packer/provision/mininet.sh b/packer/provision/mininet.sh
index b9faee4a76a1caaba7d95120e27326d8e34bb56f..45bef63f0cd6b8beb89b876696525641149fce2e 100644 (file)
--- a/packer/provision/mininet.sh
+++ b/packer/provision/mininet.sh
@@ -100,3 +100,6 @@ 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