aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormorganrOL <morgan.richomme@orange.com>2015-05-13 13:26:16 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-05-13 13:26:16 +0000
commit03898cc5b9a44c6d0112a42fdb758a76ba93347f (patch)
tree8dcfd3f1609a62201a8fe0e8901a781da488a721
parentd87137be590c7048eda824bed715b8e2f5a62611 (diff)
parent075e46994411d2f338d36752336d7079bd5d1928 (diff)
Merge "change default image name for bench testing"
-rw-r--r--testcases/VIM/OpenStack/CI/suites/opnfv-glance.json2
-rw-r--r--testcases/VIM/OpenStack/CI/suites/opnfv-nova.json30
-rw-r--r--testcases/VIM/OpenStack/CI/suites/opnfv-vm.json12
3 files changed, 22 insertions, 22 deletions
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json b/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
index 1359fff56..e560cd7ff 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
@@ -46,7 +46,7 @@
"container_format": "bare",
"disk_format": "qcow2",
"flavor": {
- "name": "m1.nano"
+ "name": "m1.small"
},
"number_instances": 2
},
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
index 2c56777dc..09ca4108a 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
@@ -6,7 +6,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"force_delete": false
},
@@ -30,7 +30,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
}
},
"runner": {
@@ -56,7 +56,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"security_group_count": 10,
"rules_per_security_group": 10
@@ -84,7 +84,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"detailed": true
},
@@ -108,7 +108,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"block_migration": false
},
@@ -132,7 +132,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
}
},
"runner": {
@@ -155,7 +155,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"force_delete": false,
"actions": [
@@ -185,7 +185,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"volume_size": 10,
"force_delete": false
@@ -210,7 +210,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"volume_size": 10
},
@@ -234,7 +234,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
}
},
"runner": {
@@ -256,7 +256,7 @@
"size": 10,
"block_migration": false,
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"flavor": {
"name": "m1.small"
@@ -282,7 +282,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"block_migration": false,
"volume_size": 10,
@@ -308,7 +308,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"force_delete": false
},
@@ -413,7 +413,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"servers_per_tenant": 2
}
@@ -427,7 +427,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"to_flavor": {
"name": "m1.small"
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json b/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
index f197ef6ba..6061f9693 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
@@ -6,13 +6,13 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"floating_network": "public",
"force_delete": false,
- "script": "samples/tasks/support/instance_dd_test.sh",
+ "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
"interpreter": "/bin/sh",
- "username": "cirros"
+ "username": "admin"
},
"runner": {
"type": "constant",
@@ -36,7 +36,7 @@
"name": "m1.small"
},
"image": {
- "name": "^TestVM*"
+ "name": "^functest-img*"
},
"volume_args": {
"size": 2
@@ -45,9 +45,9 @@
"floating_network": "public",
"use_floatingip": true,
"force_delete": false,
- "script": "samples/tasks/support/instance_dd_test.sh",
+ "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
"interpreter": "/bin/sh",
- "username": "cirros"
+ "username": "admin"
},
"runner": {
"type": "constant",