summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorwangyaoguang <sunshine.wang@huawei.com>2016-04-29 17:44:41 +0800
committerwangyaoguang <sunshine.wang@huawei.com>2016-04-29 17:50:04 +0800
commit9cae9f39066d07694d94de67761ddbc700f34af0 (patch)
tree3277b43d077bfb73c7fec2794405def187beafb1 /testsuites
parent8ff853cf793a643061fc605d7435fdb15d8c97dc (diff)
bugfix: use B-rls bottlenecks image file
JIRA: BOTTLENECK-74 Change-Id: I4cb84756d207be1f3917b2e730150b26d253e27e Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
Diffstat (limited to 'testsuites')
-rwxr-xr-xtestsuites/rubbos/run_rubbos.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py
index e49ff7e2..e5f3e534 100755
--- a/testsuites/rubbos/run_rubbos.py
+++ b/testsuites/rubbos/run_rubbos.py
@@ -297,14 +297,15 @@ def main():
global image_url
Bottlenecks_repo_dir = "/home/opnfv/bottlenecks" # same in Dockerfile, docker directory
- image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/trusty-server-cloudimg-amd64-btnks.img'
+ #image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/trusty-server-cloudimg-amd64-btnks.img'
+ image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/bottlenecks-trusty-server.img'
if not (args.conf):
logger.error("Configuration files are not set for testcase")
exit(-1)
else:
Heat_template = args.conf
-
+
master_user_data=""
agent_user_data=""
with open(Bottlenecks_repo_dir+"/utils/infra_setup/user_data/p-master-user-data") as f: