From 13877a00e5155ee93bb4255a81e104c1ebf1f11e Mon Sep 17 00:00:00 2001 From: xudan Date: Tue, 17 Apr 2018 04:05:29 -0400 Subject: 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 --- dovetail/report.py | 6 +++--- etc/conf/functest_config.yml | 9 ++++----- etc/conf/yardstick_config.yml | 2 +- etc/testcase/ipv6.tc001.yml | 2 +- etc/testcase/ipv6.tc002.yml | 2 +- etc/testcase/ipv6.tc003.yml | 2 +- etc/testcase/ipv6.tc004.yml | 2 +- etc/testcase/ipv6.tc005.yml | 2 +- etc/testcase/ipv6.tc006.yml | 2 +- etc/testcase/ipv6.tc007.yml | 2 +- etc/testcase/ipv6.tc008.yml | 2 +- etc/testcase/ipv6.tc009.yml | 2 +- etc/testcase/ipv6.tc010.yml | 2 +- etc/testcase/ipv6.tc011.yml | 2 +- etc/testcase/ipv6.tc012.yml | 2 +- etc/testcase/ipv6.tc013.yml | 2 +- etc/testcase/ipv6.tc014.yml | 2 +- etc/testcase/ipv6.tc015.yml | 2 +- etc/testcase/ipv6.tc016.yml | 2 +- etc/testcase/ipv6.tc017.yml | 2 +- etc/testcase/ipv6.tc018.yml | 2 +- etc/testcase/ipv6.tc019.yml | 2 +- etc/testcase/ipv6.tc020.yml | 2 +- etc/testcase/ipv6.tc021.yml | 2 +- etc/testcase/ipv6.tc022.yml | 2 +- etc/testcase/ipv6.tc023.yml | 2 +- etc/testcase/ipv6.tc024.yml | 2 +- etc/testcase/ipv6.tc025.yml | 2 +- etc/testcase/osinterop.tc001.yml | 7 +------ etc/testcase/sdnvpn.tc000.yml | 2 +- etc/testcase/smoke.tc001.yml | 2 +- etc/testcase/tempest.tc001.yml | 2 +- etc/testcase/tempest.tc002.yml | 2 +- etc/testcase/tempest.tc003.yml | 2 +- etc/testcase/tempest.tc004.yml | 2 +- etc/testcase/tempest.tc005.yml | 2 +- etc/userconfig/testcases.yaml | 6 +++--- 37 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dovetail/report.py b/dovetail/report.py index dea9e426..5e0458bd 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -273,10 +273,10 @@ class FunctestCrawler(object): duration = dt_utils.get_duration(timestart, timestop, self.logger) if complex_testcase: - tests = data['details']['tests'] - failed_num = data['details']['failures'] + tests = data['details']['tests_number'] + failed_num = data['details']['failures_number'] success_case = data['details']['success'] - error_case = data['details']['errors'] + error_case = data['details']['failures'] skipped_case = data['details']['skipped'] details = {"tests": tests, "failures": failed_num, 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: diff --git a/etc/testcase/ipv6.tc001.yml b/etc/testcase/ipv6.tc001.yml index c90c21c9..12db9286 100644 --- a/etc/testcase/ipv6.tc001.yml +++ b/etc/testcase/ipv6.tc001.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc001: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc002.yml b/etc/testcase/ipv6.tc002.yml index c7e8d480..1b29d0b1 100644 --- a/etc/testcase/ipv6.tc002.yml +++ b/etc/testcase/ipv6.tc002.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc002: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc003.yml b/etc/testcase/ipv6.tc003.yml index 0866407e..995e1d91 100644 --- a/etc/testcase/ipv6.tc003.yml +++ b/etc/testcase/ipv6.tc003.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc003: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc004.yml b/etc/testcase/ipv6.tc004.yml index b165af07..023bae6c 100644 --- a/etc/testcase/ipv6.tc004.yml +++ b/etc/testcase/ipv6.tc004.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc004: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc005.yml b/etc/testcase/ipv6.tc005.yml index 128a535a..f75f91e9 100644 --- a/etc/testcase/ipv6.tc005.yml +++ b/etc/testcase/ipv6.tc005.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc005: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc006.yml b/etc/testcase/ipv6.tc006.yml index ed6f683a..19f61d03 100644 --- a/etc/testcase/ipv6.tc006.yml +++ b/etc/testcase/ipv6.tc006.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc006: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc007.yml b/etc/testcase/ipv6.tc007.yml index 592a0fef..816d6c84 100644 --- a/etc/testcase/ipv6.tc007.yml +++ b/etc/testcase/ipv6.tc007.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc007: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc008.yml b/etc/testcase/ipv6.tc008.yml index 08583fdb..1a2a6554 100644 --- a/etc/testcase/ipv6.tc008.yml +++ b/etc/testcase/ipv6.tc008.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc008: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc009.yml b/etc/testcase/ipv6.tc009.yml index 74ab872f..417b67f1 100644 --- a/etc/testcase/ipv6.tc009.yml +++ b/etc/testcase/ipv6.tc009.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc009: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc010.yml b/etc/testcase/ipv6.tc010.yml index 22d36caa..e8f4049b 100644 --- a/etc/testcase/ipv6.tc010.yml +++ b/etc/testcase/ipv6.tc010.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc010: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc011.yml b/etc/testcase/ipv6.tc011.yml index a5629071..5ed78506 100644 --- a/etc/testcase/ipv6.tc011.yml +++ b/etc/testcase/ipv6.tc011.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc011: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc012.yml b/etc/testcase/ipv6.tc012.yml index 5384acc9..45093570 100644 --- a/etc/testcase/ipv6.tc012.yml +++ b/etc/testcase/ipv6.tc012.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc012: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc013.yml b/etc/testcase/ipv6.tc013.yml index 1b99e9ba..4c50788c 100644 --- a/etc/testcase/ipv6.tc013.yml +++ b/etc/testcase/ipv6.tc013.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc013: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc014.yml b/etc/testcase/ipv6.tc014.yml index fc58fa86..6cd9178d 100644 --- a/etc/testcase/ipv6.tc014.yml +++ b/etc/testcase/ipv6.tc014.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc014: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc015.yml b/etc/testcase/ipv6.tc015.yml index 5218ff9b..9dfd31b6 100644 --- a/etc/testcase/ipv6.tc015.yml +++ b/etc/testcase/ipv6.tc015.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc015: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc016.yml b/etc/testcase/ipv6.tc016.yml index e8949a0c..87174130 100644 --- a/etc/testcase/ipv6.tc016.yml +++ b/etc/testcase/ipv6.tc016.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc016: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc017.yml b/etc/testcase/ipv6.tc017.yml index 8cff0c37..579ecb37 100644 --- a/etc/testcase/ipv6.tc017.yml +++ b/etc/testcase/ipv6.tc017.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc017: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc018.yml b/etc/testcase/ipv6.tc018.yml index ff7d56be..af9c5d9f 100644 --- a/etc/testcase/ipv6.tc018.yml +++ b/etc/testcase/ipv6.tc018.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc018: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc019.yml b/etc/testcase/ipv6.tc019.yml index 4debe2d7..e02fc113 100644 --- a/etc/testcase/ipv6.tc019.yml +++ b/etc/testcase/ipv6.tc019.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc019: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc020.yml b/etc/testcase/ipv6.tc020.yml index 351b400d..a650bc02 100644 --- a/etc/testcase/ipv6.tc020.yml +++ b/etc/testcase/ipv6.tc020.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc020: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc021.yml b/etc/testcase/ipv6.tc021.yml index b25cc68c..7cfa23cd 100644 --- a/etc/testcase/ipv6.tc021.yml +++ b/etc/testcase/ipv6.tc021.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc021: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc022.yml b/etc/testcase/ipv6.tc022.yml index 08936404..268255bb 100644 --- a/etc/testcase/ipv6.tc022.yml +++ b/etc/testcase/ipv6.tc022.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc022: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc023.yml b/etc/testcase/ipv6.tc023.yml index a7f2e9f8..f8cc31cd 100644 --- a/etc/testcase/ipv6.tc023.yml +++ b/etc/testcase/ipv6.tc023.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc023: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc024.yml b/etc/testcase/ipv6.tc024.yml index 00ce3084..6f93d07f 100644 --- a/etc/testcase/ipv6.tc024.yml +++ b/etc/testcase/ipv6.tc024.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc024: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/ipv6.tc025.yml b/etc/testcase/ipv6.tc025.yml index 4828abd4..7178f92f 100644 --- a/etc/testcase/ipv6.tc025.yml +++ b/etc/testcase/ipv6.tc025.yml @@ -7,7 +7,7 @@ dovetail.ipv6.tc025: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/osinterop.tc001.yml b/etc/testcase/osinterop.tc001.yml index f0eb4b55..e375da6d 100644 --- a/etc/testcase/osinterop.tc001.yml +++ b/etc/testcase/osinterop.tc001.yml @@ -10,15 +10,10 @@ dovetail.osinterop.tc001: testcase: refstack_defcore pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: osinterop.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/refstack_client/defcore.txt - cmds: - - 'functest env prepare' - - 'functest testcase run refstack_defcore -r' - post_condition: - - 'echo test for postcondition in testcase' report: sub_testcase_list: # VIM compute operations test cases diff --git a/etc/testcase/sdnvpn.tc000.yml b/etc/testcase/sdnvpn.tc000.yml index 4b1acf23..390deb72 100644 --- a/etc/testcase/sdnvpn.tc000.yml +++ b/etc/testcase/sdnvpn.tc000.yml @@ -8,7 +8,7 @@ dovetail.sdnvpn.tc000: image_name: opnfv/functest-features pre_condition: - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py" - - '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' pre_copy: exist_src_file: sdnvpn_config_tc000.yaml dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml diff --git a/etc/testcase/smoke.tc001.yml b/etc/testcase/smoke.tc001.yml index 6d8d6924..b2b250b5 100644 --- a/etc/testcase/smoke.tc001.yml +++ b/etc/testcase/smoke.tc001.yml @@ -7,7 +7,7 @@ dovetail.smoke.tc001: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/tempest.tc001.yml b/etc/testcase/tempest.tc001.yml index 8e669248..b93363ea 100644 --- a/etc/testcase/tempest.tc001.yml +++ b/etc/testcase/tempest.tc001.yml @@ -7,7 +7,7 @@ dovetail.tempest.tc001: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/tempest.tc002.yml b/etc/testcase/tempest.tc002.yml index 4985dfac..36fe9b36 100644 --- a/etc/testcase/tempest.tc002.yml +++ b/etc/testcase/tempest.tc002.yml @@ -7,7 +7,7 @@ dovetail.tempest.tc002: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/tempest.tc003.yml b/etc/testcase/tempest.tc003.yml index b19fd2a2..980cc367 100644 --- a/etc/testcase/tempest.tc003.yml +++ b/etc/testcase/tempest.tc003.yml @@ -7,7 +7,7 @@ dovetail.tempest.tc003: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/tempest.tc004.yml b/etc/testcase/tempest.tc004.yml index a6a49f06..2df96cac 100644 --- a/etc/testcase/tempest.tc004.yml +++ b/etc/testcase/tempest.tc004.yml @@ -7,7 +7,7 @@ dovetail.tempest.tc004: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/testcase/tempest.tc005.yml b/etc/testcase/tempest.tc005.yml index b20ae5de..8f629bdb 100644 --- a/etc/testcase/tempest.tc005.yml +++ b/etc/testcase/tempest.tc005.yml @@ -7,7 +7,7 @@ dovetail.tempest.tc005: testcase: tempest_custom pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - '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' pre_copy: src_file: tempest_custom.txt dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt diff --git a/etc/userconfig/testcases.yaml b/etc/userconfig/testcases.yaml index f1cb6ae1..571ae7b0 100644 --- a/etc/userconfig/testcases.yaml +++ b/etc/userconfig/testcases.yaml @@ -108,14 +108,14 @@ tiers: blocking: false description: >- This test case runs a sub group of tests of the OpenStack - Defcore testcases by using refstack client. + Defcore testcases. dependencies: installer: '' scenario: '' run: module: - 'functest.opnfv_tests.openstack.refstack_client.refstack_client' - class: 'RefstackClient' + 'functest.opnfv_tests.openstack.refstack.refstack' + class: 'Refstack' - case_name: tempest_smoke_serial -- cgit 1.2.3-korg