5 files changed, 69 insertions, 16 deletions

diff --git a/dovetail/conf/bottlenecks_config.yml b/dovetail/conf/bottlenecks_config.yml
new file mode 100644
index 00000000..43df8c55
--- /dev/null
+++ b/dovetail/conf/bottlenecks_config.yml
@@ -0,0 +1,20 @@
+---
+bottlenecks:
+  image_name: opnfv/bottlenecks
+  docker_tag: cvp.0.4.0
+  opts: '-id --privileged=true'
+  config:
+    dir: '/home/opnfv/userconfig'
+  pre_condition:
+    - 'echo test for precondition in bottlenecks'
+  cmds:
+    - '/home/opnfv/bottlenecks/run_tests.sh -c {{validate_testcase}}'
+  post_condition:
+    - 'echo test for postcondition in bottlenecks'
+  result:
+    dir: '/tmp'
+    file_path: 'bottlenecks.log'
+  openrc: '/tmp/admin_rc.sh'
+  extra_container:
+    - 'Bottlenecks-Yardstick'
+    - 'Bottlenecks-ELK'
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index da8c4732..58409f2b 100644
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -21,21 +21,21 @@ cli:
           - '-y'
         path:
           - 'yardstick/docker_tag'
-        help: 'Overwrite tag for yardstick docker container (e.g. stable or latest)'
+        help: 'Overwrite tag for yardstick docker container (e.g. danube.3.2)'
       func_tag:
         flags:
           - '--func_tag'
           - '-f'
         path:
           - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. stable or latest)'
-      openrc:
+        help: 'Overwrite tag for functest docker container (e.g. cvp.0.5.0)'
+      bott_tag:
         flags:
-          - '--openrc'
-          - '-o'
+          - '--bott_tag'
+          - '-b'
         path:
-          - 'openrc'
-        help: 'Openstack Credential file location'
+          - 'bottlenecks/docker_tag'
+        help: 'Overwrite tag for bottlenecks docker container (e.g. cvp.0.4.0)'
     control:
       testsuite:
         flags:
@@ -57,7 +57,7 @@ cli:
         flags:
           - '--report'
           - '-r'
-        help: 'push results to DB (e.g. --report http://192.168.135.2:8000/api/v1)'
+        help: 'push results to DB (e.g. --report http://192.168.135.2:8000/api/v1/results)'
       offline:
         flags:
           - '--offline'
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 934ff6a6..de849a52 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -5,7 +5,20 @@ report_dest: 'file'
 result_file: 'results.json'
 
 # OPENSTACK Credential file
-openrc: '/home/opnfv/dovetail/openrc.sh'
+env_file: 'env_config.sh'
+
+# POD info file
+pod_file: 'pod.yaml'
+
+# JUMPSERVER private key used in pod_file to login hosts
+# If use password to login hosts, there's no need to provide the private key
+pri_key: 'id_rsa'
+
+# SDNVPN offline image
+sdnvpn_image: 'ubuntu-16.04-server-cloudimg-amd64-disk1.img'
+
+# Tempest image
+cirros_image: 'cirros-0.3.5-x86_64-disk.img'
 
 COMPLIANCE_PATH: compliance/
 TESTCASE_PATH: testcase/
@@ -20,9 +33,10 @@ testarea_supported:
   - example
   - ha
   - ipv6
-  - nfvi
   - sdnvpn
-  - vimops
+  - vping
+  - resiliency
+  - tempest
 
 functest_testsuite:
   - refstack_defcore
@@ -57,10 +71,12 @@ parameters:
 include_config:
   - functest_config.yml
   - yardstick_config.yml
+  - bottlenecks_config.yml
 
 test_project:
   - 'yardstick'
   - 'functest'
+  - 'bottlenecks'
 
 validate_input:
   valid_docker_tag:
@@ -69,3 +85,11 @@ validate_input:
     - 'danube.1.0'
     - 'danube.2.0'
     - 'danube.3.0'
+    - 'danube.3.1'
+    - 'danube.3.2'
+    - 'cvp.0.1.0'
+    - 'cvp.0.2.0'
+    - 'cvp.0.3.0'
+    - 'cvp.0.4.0'
+    - 'cvp.0.5.0'
+    - 'cvp.0.6.0'
diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
index 460506a6..11c49e32 100644
--- a/dovetail/conf/functest_config.yml
+++ b/dovetail/conf/functest_config.yml
@@ -1,7 +1,7 @@
 ---
 functest:
   image_name: opnfv/functest
-  docker_tag: latest
+  docker_tag: cvp.0.5.0
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'
diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index ae59a9ec..f49d044d 100644
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -1,22 +1,28 @@
 ---
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: latest
+  docker_tag: danube.3.2
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'
   pre_condition:
-    - ''
     # - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
     #     source tests/ci/clean_images.sh && cleanup'
     # - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
     #     source tests/ci/load_images.sh'
+    # Copy Yardstick bugfix patches to Yardstick repository
+    - "cp -r /home/opnfv/userconfig/patch/ /home/opnfv/repos/yardstick/"
+    # Config git user info for applying bugfix patches
+    - "cd /home/opnfv/repos/yardstick && git config --global user.email 'you@example.com'"
+    - "cd /home/opnfv/repos/yardstick && git config --global user.name 'Your Name'"
+    # Apply all bugfix patchs on tempest code
+    - "cd /home/opnfv/repos/yardstick && git am ./patch/*.patch"
   cmds:
     - 'mkdir -p /home/opnfv/yardstick/results/'
     - "cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
          yardstick -d task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
-         --output-file /home/opnfv/yardstick/results/{{validate_testcase}}.out
-         --task-args '{'file': '/home/opnfv/userconfig/pod.yaml'}'"
+         --output-file /home/opnfv/yardstick/results/{{testcase}}.out
+         --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml'}'"
   post_condition:
     - ''
   result:
@@ -25,3 +31,6 @@ yardstick:
     file_path: 'yardstick.log'
     key_path: '/root/.ssh/id_rsa'
   openrc: '/etc/yardstick/openstack.creds'
+  yard_conf:
+    src_file: '/home/opnfv/repos/yardstick/etc/yardstick/yardstick.conf.sample'
+    dest_file: '/etc/yardstick/yardstick.conf'