diff options
| author | Hiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp> | 2015-03-31 18:24:22 +0900 |
|---|---|---|
| committer | Hiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp> | 2015-03-31 18:24:22 +0900 |
| commit | 808e8bd92a9e8607cf70640876d3fe59f06361ef (patch) | |
| tree | 6d0fd68796041c5d467a3215e7a4f8b79b99f242 | |
| parent | 0681712241628b7f48c67f5ee548fdf29a582611 (diff) | |
scenario_test: change gobgpd binary path
| -rw-r--r-- | test/scenario_test/docker_control.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/scenario_test/docker_control.py b/test/scenario_test/docker_control.py index 9650f418..1e528bbf 100644 --- a/test/scenario_test/docker_control.py +++ b/test/scenario_test/docker_control.py @@ -160,9 +160,10 @@ def make_startup_file(log_opt=""): file_buff = '#!/bin/bash' + '\n' file_buff += 'cd /go/src/github.com/osrg/gobgp' + '\n' file_buff += 'git pull origin master' + '\n' + file_buff += 'cd gobgpd' + '\n' file_buff += 'go get -v' + '\n' file_buff += 'go build' + '\n' - file_buff += './gobgp -f ' + SHARE_VOLUME + '/gobgpd.conf ' + log_opt + ' > ' + SHARE_VOLUME + '/gobgpd.log' + file_buff += './gobgpd -f ' + SHARE_VOLUME + '/gobgpd.conf ' + log_opt + ' > ' + SHARE_VOLUME + '/gobgpd.log' cmd = "echo \"" + file_buff + "\" > " + CONFIG_DIR + "/" + STARTUP_FILE_NAME local(cmd, capture=True) cmd = "chmod 755 " + CONFIG_DIRR + STARTUP_FILE_NAME @@ -175,9 +176,10 @@ def make_startup_file_use_local_gobgp(log_opt=""): file_buff += 'rm -rf /go/src/github.com/osrg/gobgp' + '\n' file_buff += 'cp -r ' + SHARE_VOLUME + '/gobgp /go/src/github.com/osrg/' + '\n' file_buff += 'cd /go/src/github.com/osrg/gobgp' + '\n' + file_buff += 'cd gobgpd' + '\n' file_buff += 'go get -v' + '\n' file_buff += 'go build' + '\n' - file_buff += './gobgp -f ' + SHARE_VOLUME + '/gobgpd.conf ' + log_opt + ' > ' + SHARE_VOLUME + '/gobgpd.log' + file_buff += './gobgpd -f ' + SHARE_VOLUME + '/gobgpd.conf ' + log_opt + ' > ' + SHARE_VOLUME + '/gobgpd.log' cmd = "echo \"" + file_buff + "\" > " + CONFIG_DIR + "/" + STARTUP_FILE_NAME local(cmd, capture=True) cmd = "chmod 755 " + CONFIG_DIRR + STARTUP_FILE_NAME |