From a53ad2a58fc8f8375cb50333e753f0a74d238df7 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 31 Oct 2018 00:02:53 -0400 Subject: Update tests based on tempest_custom All tempest_custom test cases should be updated and defined with the new test case config yaml file. Change-Id: Iaff99fcfcef61060a8ca02819cac2763c4bdd2a0 Signed-off-by: xudan --- etc/testcase/functest.tempest.compute.yml | 2 +- etc/testcase/functest.tempest.identity_v3.yml | 2 +- etc/testcase/functest.tempest.image.yml | 2 +- etc/testcase/functest.tempest.ipv6_api.yml | 2 +- etc/testcase/functest.tempest.ipv6_scenario.yml | 2 +- .../functest.tempest.multi_node_scheduling.yml | 2 +- etc/testcase/functest.tempest.network_api.yml | 2 +- etc/testcase/functest.tempest.network_scenario.yml | 2 +- etc/testcase/functest.tempest.network_security.yml | 2 +- etc/testcase/functest.tempest.vm_lifecycle.yml | 2 +- etc/testcase/functest.tempest.volume.yml | 2 +- etc/userconfig/tempest_custom_testcases.yaml | 25 ++++++++++++++++++++++ 12 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 etc/userconfig/tempest_custom_testcases.yaml diff --git a/etc/testcase/functest.tempest.compute.yml b/etc/testcase/functest.tempest.compute.yml index 3cef7485..36b4d569 100644 --- a/etc/testcase/functest.tempest.compute.yml +++ b/etc/testcase/functest.tempest.compute.yml @@ -7,7 +7,7 @@ functest.tempest.compute: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.identity_v3.yml b/etc/testcase/functest.tempest.identity_v3.yml index ed9a8ca9..7e64ce19 100644 --- a/etc/testcase/functest.tempest.identity_v3.yml +++ b/etc/testcase/functest.tempest.identity_v3.yml @@ -7,7 +7,7 @@ functest.tempest.identity_v3: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.image.yml b/etc/testcase/functest.tempest.image.yml index 547dbcf7..d81aa58d 100644 --- a/etc/testcase/functest.tempest.image.yml +++ b/etc/testcase/functest.tempest.image.yml @@ -7,7 +7,7 @@ functest.tempest.image: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.ipv6_api.yml b/etc/testcase/functest.tempest.ipv6_api.yml index 47aade6a..38a5c8d7 100644 --- a/etc/testcase/functest.tempest.ipv6_api.yml +++ b/etc/testcase/functest.tempest.ipv6_api.yml @@ -7,7 +7,7 @@ functest.tempest.ipv6_api: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.ipv6_scenario.yml b/etc/testcase/functest.tempest.ipv6_scenario.yml index 4b0758bb..2378f5e7 100644 --- a/etc/testcase/functest.tempest.ipv6_scenario.yml +++ b/etc/testcase/functest.tempest.ipv6_scenario.yml @@ -7,7 +7,7 @@ functest.tempest.ipv6_scenario: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.multi_node_scheduling.yml b/etc/testcase/functest.tempest.multi_node_scheduling.yml index ae20074f..3f14294a 100644 --- a/etc/testcase/functest.tempest.multi_node_scheduling.yml +++ b/etc/testcase/functest.tempest.multi_node_scheduling.yml @@ -7,7 +7,7 @@ functest.tempest.multi_node_scheduling: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.network_api.yml b/etc/testcase/functest.tempest.network_api.yml index bac7c663..8d2f53ba 100644 --- a/etc/testcase/functest.tempest.network_api.yml +++ b/etc/testcase/functest.tempest.network_api.yml @@ -7,7 +7,7 @@ functest.tempest.network_api: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.network_scenario.yml b/etc/testcase/functest.tempest.network_scenario.yml index f048c1b4..24511b1d 100644 --- a/etc/testcase/functest.tempest.network_scenario.yml +++ b/etc/testcase/functest.tempest.network_scenario.yml @@ -7,7 +7,7 @@ functest.tempest.network_scenario: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.network_security.yml b/etc/testcase/functest.tempest.network_security.yml index b8eaa25a..f2a7f75f 100644 --- a/etc/testcase/functest.tempest.network_security.yml +++ b/etc/testcase/functest.tempest.network_security.yml @@ -7,7 +7,7 @@ functest.tempest.network_security: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.vm_lifecycle.yml b/etc/testcase/functest.tempest.vm_lifecycle.yml index c05a1d3c..4bf7b326 100644 --- a/etc/testcase/functest.tempest.vm_lifecycle.yml +++ b/etc/testcase/functest.tempest.vm_lifecycle.yml @@ -7,7 +7,7 @@ functest.tempest.vm_lifecycle: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/functest.tempest.volume.yml b/etc/testcase/functest.tempest.volume.yml index 293470bf..62e33956 100644 --- a/etc/testcase/functest.tempest.volume.yml +++ b/etc/testcase/functest.tempest.volume.yml @@ -7,7 +7,7 @@ functest.tempest.volume: 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/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_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/tempest_custom_testcases.yaml b/etc/userconfig/tempest_custom_testcases.yaml new file mode 100644 index 00000000..5821a6ff --- /dev/null +++ b/etc/userconfig/tempest_custom_testcases.yaml @@ -0,0 +1,25 @@ +--- +tiers: + - + name: smoke + order: 1 + description: >- + Set of basic Functional tests to validate the OPNFV scenarios. + testcases: + - + case_name: tempest_custom + project_name: functest + criteria: 100 + blocking: false + description: >- + The test case allows running a customized list of tempest + test cases defined in a file under + /functest/opnfv_tests/openstack/ + /tempest/custom_tests/test_list.txt + The file is empty and can be customized with the desired tests. + run: + name: tempest_common + args: + mode: 'custom' + option: + - '--concurrency=4' -- cgit 1.2.3-korg