diff options
| -rw-r--r-- | rumba/prototypes/irati.py | 18 | ||||
| -rw-r--r-- | rumba/testbeds/jfed.py | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index c630a94..7004831 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -67,17 +67,19 @@ class Experiment(mod.Experiment): def install(self): """Installs IRATI on the nodes.""" - cmds = ["sudo apt-get update", + cmds = [self.sudo("apt-get update"), "export https_proxy=\"https://proxy.atlantis.ugent.be:8080\"; " - "sudo apt-get install g++ gcc " - "protobuf-compiler libprotobuf-dev git --yes", - "sudo rm -rf ~/irati", + + self.sudo("apt-get install g++ gcc " + "protobuf-compiler libprotobuf-dev git --yes" + "pkg-config " + "libnl-3-dev libnl-genl-3-dev"), + self.sudo("rm -rf ~/irati"), "cd ~; " "export https_proxy=\"https://proxy.atlantis.ugent.be:8080\"; " - "git clone https://github.com/IRATI/stack irati", - "cd ~/irati; git checkout arcfire", - "cd ~/irati; cp linux/config-IRATI linux/.config", - "cd ~/irati && sudo ./install-from-scratch"] + + "git clone https://github.com/IRATI/stack irati", + "cd ~/irati && git checkout arcfire", + "cd ~/irati && " + + self.sudo("./install-from-scratch")] for node in self.nodes: ssh.execute_commands(self.testbed, node.ssh_config, diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index 60d6605..53a812f 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -49,7 +49,7 @@ class Testbed(mod.Testbed): self.jfed_jar = "jfed_cli/experimenter-cli.jar" if image is not None: self.image = "urn:publicid:IDN+" + authority + \ - "+image+GeniSlices:" + image + "+image+wall2-ilabt-iminds-be:" + image else: self.image = None |