increase RAM and CPU cores for Vagrant template
reduce RAM for Vagrant VMs used to run tests
build packages with multiple threads
refs #4382
Change-Id: I30ad59a6e705bafa60f5680f725b528bac5f9833
diff --git a/.gitignore b/.gitignore
index 986f9d6..0bb0587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
*.pyc
*.pyo
+/.vagrant/
/install_helpers/tools/generate-link-object
/install_helpers/tools/test-nack-consumer
/install_helpers/tools/test-nexthopfaceid-consumer
+/nfd-integ.box
/temp/
/test_interest_loop/keys/
logs/
diff --git a/Vagrantfile b/Vagrantfile
index a95f369..be9da5e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -51,7 +51,7 @@
config.vm.box = "ubuntu/trusty64"
config.vm.provider "virtualbox" do |vb|
- vb.memory = "2048"
+ vb.memory = "512"
vb.cpus = "1"
vb.customize ["storagectl", :id, "--name", "SATAController", "--hostiocache", "off"]
end
@@ -60,6 +60,10 @@
t.vm.provision "shell", inline: $setup, privileged: false
t.vm.provision "shell", inline: $setup_ssh, privileged: false
t.vm.provision "shell", inline: $setup_integ, privileged: false
+ config.vm.provider "virtualbox" do |vb|
+ vb.memory = "6144"
+ vb.cpus = "4"
+ end
end
config.vm.define "A" do |a|
diff --git a/install_helpers/install_NFD.py b/install_helpers/install_NFD.py
index 830644d..748af57 100644
--- a/install_helpers/install_NFD.py
+++ b/install_helpers/install_NFD.py
@@ -7,10 +7,9 @@
print "**************"
os.system("git clone --depth 1 https://github.com/named-data/NFD")
os.chdir("NFD")
- os.system("./waf distclean")
os.system("git submodule init && git submodule update")
os.system("./waf configure")
- os.system("./waf -j1")
+ os.system("./waf")
os.system("sudo ./waf install")
os.system("sudo cp /usr/local/etc/ndn/nfd.conf.sample /usr/local/etc/ndn/nfd.conf")
os.system("sudo mkdir /usr/local/etc/ndn/keys/")
diff --git a/install_helpers/install_ndncxx.py b/install_helpers/install_ndncxx.py
index 54fac0d..74495f5 100644
--- a/install_helpers/install_ndncxx.py
+++ b/install_helpers/install_ndncxx.py
@@ -7,9 +7,8 @@
print "**********************"
os.system("git clone --depth 1 https://github.com/named-data/ndn-cxx")
os.chdir("ndn-cxx")
- os.system("./waf distclean")
os.system("./waf configure")
- os.system("./waf -j1")
+ os.system("./waf")
os.system("sudo ./waf install")
os.system("mkdir -p ~/.ndn")
os.system("sudo ldconfig")
diff --git a/install_helpers/install_ndntools.py b/install_helpers/install_ndntools.py
index 9147a2b..d4d0b92 100644
--- a/install_helpers/install_ndntools.py
+++ b/install_helpers/install_ndntools.py
@@ -7,8 +7,7 @@
print "***********************"
os.system("git clone --depth 1 https://github.com/named-data/ndn-tools")
os.chdir("ndn-tools")
- os.system("./waf distclean")
os.system("./waf configure")
- os.system("./waf -j1")
+ os.system("./waf")
os.system("sudo ./waf install")
os.chdir("..")
diff --git a/install_helpers/install_ndntraffic.py b/install_helpers/install_ndntraffic.py
index 0969f15..f8e85ab 100644
--- a/install_helpers/install_ndntraffic.py
+++ b/install_helpers/install_ndntraffic.py
@@ -7,8 +7,7 @@
print "********************************"
os.system("git clone --depth 1 https://github.com/named-data/ndn-traffic-generator")
os.chdir("ndn-traffic-generator")
- os.system("./waf distclean")
os.system("./waf configure")
- os.system("./waf -j1")
+ os.system("./waf")
os.system("sudo ./waf install")
os.chdir("..")
diff --git a/install_helpers/install_repo.py b/install_helpers/install_repo.py
index 1307724..8748274 100644
--- a/install_helpers/install_repo.py
+++ b/install_helpers/install_repo.py
@@ -1,14 +1,13 @@
#!/usr/bin/python2
import os
-# Install ndn-tlv-ping
+# Install repo-ng
def run():
print "\nINSTALLING repo-ng"
print "***********************"
os.system("git clone --depth 1 https://github.com/named-data/repo-ng")
os.chdir("repo-ng")
- os.system("./waf distclean")
os.system("./waf configure")
- os.system("./waf -j1")
+ os.system("./waf")
os.system("sudo ./waf install")
os.chdir("..")