From 0f4d539cac991f1cc805c5824f2a0082da8ee4d7 Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Wed, 20 Sep 2017 14:26:56 +0200 Subject: SSH: Increasing ssh retries temporarily: TBD in a better way --- .gitlab-ci.yml | 1 + rumba/ssh_support.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f8d116..1632e20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,3 +7,4 @@ before_script: irati-test: script: - python examples/vpn.py + - python examples/two-layers.py diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 9c24890..23e1e49 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -60,7 +60,7 @@ def _print_stream(stream): def ssh_connect(ssh_client, hostname, port, username, password, time_out, proxy): retry = 0 - max_retries = 5 + max_retries = 12 while retry < max_retries: time.sleep(retry * 5) try: -- cgit v1.2.3 From 0d7dac11d5268f0802a0816860ce7f9ff14c53ee Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Tue, 26 Sep 2017 15:41:52 +0200 Subject: Readme: added qemu testbed dependencies --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index db3211a..c2bb43e 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,10 @@ folder. * [QEMU](http://wiki.qemu-project.org/Main_Page) is a generic and open source machine emulator and virtualizer. + + In order to use the qemu testbed, the user should install the + following dependencies: + `sudo apt-get install bridge-utils qemu` A minimal QEMU testbed is defined as follows: -- cgit v1.2.3 From 23e32cf4593cdefe05f8c092604836a6c07917da Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Tue, 26 Sep 2017 15:44:27 +0200 Subject: Readme-qemu: Better formatting and phrasing --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c2bb43e..beb56c8 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,9 @@ folder. open source machine emulator and virtualizer. In order to use the qemu testbed, the user should install the - following dependencies: - `sudo apt-get install bridge-utils qemu` + qemu and bredge-utils packages ion which the testbed depends: + + # sudo apt-get install bridge-utils qemu A minimal QEMU testbed is defined as follows: -- cgit v1.2.3 From 374202aa8c2dd0e06c49375f1ee7cb439b4f1191 Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Tue, 26 Sep 2017 16:51:06 +0200 Subject: CI: reverted to pipeline-passing config --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1632e20..1f8d116 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,4 +7,3 @@ before_script: irati-test: script: - python examples/vpn.py - - python examples/two-layers.py -- cgit v1.2.3