diff options
Diffstat (limited to 'dovetail/conf')
| -rw-r--r-- | dovetail/conf/cmd_config.yml | 4 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.yml | 7 | ||||
| -rw-r--r-- | dovetail/conf/functest_config.yml | 2 | ||||
| -rw-r--r-- | dovetail/conf/yardstick_config.yml | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index d862a910..58409f2b 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -21,14 +21,14 @@ cli: - '-y' path: - 'yardstick/docker_tag' - help: 'Overwrite tag for yardstick docker container (e.g. danube.3.1)' + 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. cvp.0.2.0)' + help: 'Overwrite tag for functest docker container (e.g. cvp.0.5.0)' bott_tag: flags: - '--bott_tag' diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index 98f9e814..de849a52 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -17,6 +17,9 @@ 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/ # testsuite supported, should adjust accordingly @@ -33,6 +36,7 @@ testarea_supported: - sdnvpn - vping - resiliency + - tempest functest_testsuite: - refstack_defcore @@ -82,7 +86,10 @@ validate_input: - '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 c33a0a91..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: cvp.0.2.0 + 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 fd93d61a..f49d044d 100644 --- a/dovetail/conf/yardstick_config.yml +++ b/dovetail/conf/yardstick_config.yml @@ -1,16 +1,22 @@ --- yardstick: image_name: opnfv/yardstick - docker_tag: danube.3.1 + 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 && |