summaryrefslogtreecommitdiffstats
path: root/etc/conf
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-04-17 04:05:29 -0400
committerxudan <xudan16@huawei.com>2018-04-17 22:23:28 -0400
commit13877a00e5155ee93bb4255a81e104c1ebf1f11e (patch)
treefcdfb61898594e0681765e10ae4073dc82bb9640 /etc/conf
parent749946dcc5b17cfca43c6e8692359f4972e48b21 (diff)
Switch to OPNFV Fraser release
1. Use Functest Fraser docker images whose tag is fraser 2. Use Yardstick stable docker images 3. Functest fraser has moved testcases.yaml file from functest/ci to xtesting/ci 4. Functest fraser has removed 'functest env prepare' command 5. Functest uses rally to execute osinterop test cases instead of refstack_client Change-Id: I81ebefe6ea959ca77c2c87f1d75ef56ac18c165f Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc/conf')
-rw-r--r--etc/conf/functest_config.yml9
-rw-r--r--etc/conf/yardstick_config.yml2
2 files changed, 5 insertions, 6 deletions
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index f76bac4d..0251b732 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -1,7 +1,7 @@
---
functest:
image_name: opnfv/functest-smoke
- docker_tag: euphrates
+ docker_tag: fraser
opts: '-id --privileged=true'
envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=unknown -e NODE_NAME=unknown
-e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt'
@@ -9,13 +9,12 @@ functest:
dir: '/home/opnfv/userconfig'
images: '/home/opnfv/functest/images'
pre_condition:
- - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
cmds:
- - 'functest env prepare'
- - 'functest testcase run {{validate_testcase}} -r'
+ - 'run_tests -t {{validate_testcase}} -r'
post_condition:
- 'echo test for postcondition in functest'
result:
dir: '/home/opnfv/functest/results'
file_path: 'functest_results.txt'
- openrc: '/home/opnfv/functest/conf/openstack.creds'
+ openrc: '/home/opnfv/functest/conf/env_file'
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 6e09c271..f5a01b81 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -12,7 +12,7 @@
yardstick:
image_name: opnfv/yardstick
- docker_tag: opnfv-5.1.0
+ docker_tag: stable
opts: '-id --privileged=true'
envs: {{os_cacert}}
config: