Update bottlenecks conf

1. Copy a ubuntu image to Bottlenecks to support offline
2. Add an env DEPLOY_SCENARIO to bottlenecks to support DPDK
3. Set push results to DB False

JIRA: DOVETAIL-706
JIRA: DOVETAIL-707

Change-Id: I81f293bb9fddc63fd8be455546ba4642ca670fc7
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index 3c92d0f..8cb28fb 100644 (file)
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -2,40 +2,21 @@
 
 {% set validate_testcase = validate_testcase or '' %}
 {% set testcase = testcase or '' %}
-{% set os_insecure = os_insecure or 'False' %}
-{% set os_cacert = '' %}
-{% if os_insecure == 'True' %}
-    {% set os_cacert = ' -e OS_CACERT=False ' %}
-{% endif %}
+{% set deploy_scenario = deploy_scenario or 'unknown' %}
 
 bottlenecks:
   image_name: opnfv/bottlenecks
   docker_tag: stable
   opts: '-id --privileged=true'
-  envs: '{{os_cacert}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out'
+  envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out'
   volumes:
     - '-v /var/run/docker.sock:/var/run/docker.sock'
   config:
     dir: '/home/opnfv/userconfig'
   pre_condition:
-    - 'source /tmp/admin_rc.sh &&
-       (openstack --insecure image list | grep cirros-0.4.0 ||
-       openstack --insecure image create cirros-0.4.0
-       --disk-format qcow2 --container-format bare
-       --file /home/opnfv/userconfig/images/cirros-0.4.0-x86_64-disk.img)'
-    - 'source /tmp/admin_rc.sh &&
-       (openstack --insecure flavor list | grep yardstick-flavor ||
-       openstack --insecure flavor create --id 100
-       --ram 1024 --disk 3 --vcpus 1 yardstick-flavor)'
+    - 'cp /home/opnfv/userconfig/images/cirros-0.4.0-x86_64-disk.img /tmp/yardstick.img'
   cmds:
-    - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} True'
-  post_condition:
-    - 'source /tmp/admin_rc.sh &&
-       (! openstack --insecure image list | grep cirros-0.4.0 ||
-       openstack --insecure image delete cirros-0.4.0)'
-    - 'source /tmp/admin_rc.sh &&
-       (! openstack --insecure flavor list | grep yardstick-flavor ||
-       openstack --insecure flavor delete yardstick-flavor)'
+    - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} False'
   result:
     dir: '/tmp'
   openrc: '/tmp/admin_rc.sh'