diff options
33 files changed, 102 insertions, 289 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 6d2bcf66..1579ff69 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -149,14 +149,16 @@ def get_result_path(): 'pre_config') dt_cfg.dovetail_config['patch_dir'] = os.path.join(dovetail_home, 'patches') + dt_cfg.dovetail_config['userconfig_dir'] = os.path.join(dovetail_home, + 'userconfig') return dovetail_home def copy_userconfig_files(logger): - pre_config_path = dt_cfg.dovetail_config['config_dir'] - if not os.path.isdir(pre_config_path): - os.makedirs(pre_config_path) - cmd = 'sudo cp -r %s/* %s' % (constants.USERCONF_PATH, pre_config_path) + userconfig_path = dt_cfg.dovetail_config['userconfig_dir'] + if not os.path.isdir(userconfig_path): + os.makedirs(userconfig_path) + cmd = 'sudo cp -r %s/* %s' % (constants.USERCONF_PATH, userconfig_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index 884ce1ad..2fa1eee4 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -63,26 +63,6 @@ class DockerRunner(Runner): def create_log(cls): cls.logger = dt_logger.Logger(__name__ + '.DockerRunner').getLogger() - def pre_copy(self, container=None, dest_path=None, - src_file=None, exist_file=None): - if not container: - self.logger.error("Container instance is None.") - return None - if not dest_path: - self.logger.error("There has no dest_path in {} config file." - .format(self.testcase.name())) - return None - if src_file: - self.testcase.mk_src_file() - file_path = dt_cfg.dovetail_config[self.type]['result']['dir'] - src_path = os.path.join(file_path, src_file) - if exist_file: - file_path = dt_cfg.dovetail_config[self.type]['config']['dir'] - src_path = os.path.join(file_path, 'pre_config', exist_file) - - container.copy_file(src_path, dest_path) - return dest_path - def run(self): container = Container(self.testcase) docker_image = container.get_docker_image() @@ -104,14 +84,7 @@ class DockerRunner(Runner): self.logger.debug('container id: {}'.format(container_id)) - dest_path = self.testcase.pre_copy_path('dest_path') - src_file_name = self.testcase.pre_copy_path('src_file') - exist_file_name = self.testcase.pre_copy_path('exist_src_file') - - if src_file_name or exist_file_name: - if not self.pre_copy(container, dest_path, src_file_name, - exist_file_name): - return + self.testcase.mk_src_file() cmds = self.testcase.pre_condition() if cmds: diff --git a/dovetail/testcase.py b/dovetail/testcase.py index b79bcfa7..74fbbea8 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -136,21 +136,20 @@ class Testcase(object): return post_condition def mk_src_file(self): - testcase_src_file = self.pre_copy_path('src_file') - try: - file_path = os.path.join(dt_cfg.dovetail_config['result_dir'], - testcase_src_file) - with open(file_path, 'w+') as src_file: - if self.sub_testcase() is not None: + test_list = os.path.join(dt_cfg.dovetail_config['result_dir'], + 'tempest_custom.txt') + if self.sub_testcase() is not None: + try: + with open(test_list, 'w+') as src_file: for sub_test in self.sub_testcase(): self.logger.debug( 'Save test cases {}'.format(sub_test)) src_file.write(sub_test + '\n') - self.logger.debug('Save test cases to {}'.format(file_path)) - return file_path - except Exception: - self.logger.exception('Failed to save: {}'.format(file_path)) - return None + self.logger.debug('Save test cases to {}'.format(test_list)) + return test_list + except Exception: + self.logger.exception('Failed to save: {}'.format(test_list)) + return None def run(self): runner = TestRunnerFactory.create(self) @@ -294,8 +293,7 @@ class FunctestTestcase(Testcase): # patch inside the functest container if dt_cfg.dovetail_config['no_api_validation']: patch_cmd = os.path.join( - dt_cfg.dovetail_config['functest']['config']['dir'], - 'patches', + dt_cfg.dovetail_config['functest']['patches_dir'], 'functest', 'disable-api-validation', 'apply.sh') diff --git a/dovetail/tests/unit/test_run.py b/dovetail/tests/unit/test_run.py index c7fe4d6d..fed198c0 100644 --- a/dovetail/tests/unit/test_run.py +++ b/dovetail/tests/unit/test_run.py @@ -259,7 +259,8 @@ class RunTesting(unittest.TestCase): dovetail_home = 'dovetail_home' mock_os.environ = {'DOVETAIL_HOME': dovetail_home} mock_os.path.join.side_effect = [ - 'result_path', 'images_dir', 'pre_config_path', 'patch_set_path'] + 'result_path', 'images_dir', 'pre_config_path', 'patch_set_path', + 'userconfig_dir'] mock_config.dovetail_config = {} result = dt_run.get_result_path() @@ -268,12 +269,14 @@ class RunTesting(unittest.TestCase): call(dovetail_home, 'results'), call(dovetail_home, 'images'), call(dovetail_home, 'pre_config'), - call(dovetail_home, 'patches')]) + call(dovetail_home, 'patches'), + call(dovetail_home, 'userconfig')]) expected_dict = { 'result_dir': 'result_path', 'images_dir': 'images_dir', 'config_dir': 'pre_config_path', - 'patch_dir': 'patch_set_path'} + 'patch_dir': 'patch_set_path', + 'userconfig_dir': 'userconfig_dir'} self.assertEquals(expected_dict, mock_config.dovetail_config) self.assertEquals(dovetail_home, result) @@ -291,7 +294,7 @@ class RunTesting(unittest.TestCase): @patch('dovetail.run.os') def test_copy_userconfig_files(self, mock_os, mock_utils, mock_config, mock_constants): - mock_config.dovetail_config = {'config_dir': 'value'} + mock_config.dovetail_config = {'userconfig_dir': 'value'} mock_os.path.isdir.return_value = False mock_constants.USERCONF_PATH = 'value' logger = Mock() diff --git a/dovetail/tests/unit/test_test_runner.py b/dovetail/tests/unit/test_test_runner.py index 08dbde69..2570ec76 100644 --- a/dovetail/tests/unit/test_test_runner.py +++ b/dovetail/tests/unit/test_test_runner.py @@ -43,65 +43,6 @@ class TestRunnerTesting(unittest.TestCase): @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.dt_cfg') - def test_pre_copy_no_container(self, mock_config, mock_utils): - t_runner.FunctestRunner.create_log() - mock_config.dovetail_config = {'result_dir': 'result_dir'} - docker_runner = t_runner.FunctestRunner(self.testcase) - - result = docker_runner.pre_copy( - container=None, dest_path=None, - src_file=None, exist_file=None) - - docker_runner.logger.error.assert_called_once_with( - 'Container instance is None.') - self.assertEquals(None, result) - - @patch('dovetail.test_runner.dt_utils') - @patch('dovetail.test_runner.dt_cfg') - def test_pre_copy_no_dest_path(self, mock_config, mock_utils): - t_runner.FunctestRunner.create_log() - mock_config.dovetail_config = {'result_dir': 'result_dir'} - docker_runner = t_runner.FunctestRunner(self.testcase) - - result = docker_runner.pre_copy( - container='container', dest_path=None, - src_file=None, exist_file=None) - - docker_runner.logger.error.assert_called_once_with( - 'There has no dest_path in {} config file.'.format( - self.testcase_name)) - self.assertEquals(None, result) - - @patch('dovetail.test_runner.dt_cfg') - @patch('dovetail.test_runner.os.path') - def test_pre_copy(self, mock_path, mock_config): - t_runner.FunctestRunner.create_log() - docker_runner = t_runner.FunctestRunner(self.testcase) - mock_config.dovetail_config = { - 'functest': { - 'result': { - 'dir': 'result_dir' - }, - 'config': { - 'dir': 'config_dir' - } - } - } - container_obj = Mock() - mock_path.join.return_value = 'join' - - result = docker_runner.pre_copy( - container=container_obj, dest_path='dest_path', - src_file='src_file', exist_file='exist_file') - - mock_path.join.assert_has_calls([ - call('result_dir', 'src_file'), - call('config_dir', 'pre_config', 'exist_file')]) - container_obj.copy_file.assert_called_once_with('join', 'dest_path') - self.assertEquals('dest_path', result) - - @patch('dovetail.test_runner.dt_utils') - @patch('dovetail.test_runner.dt_cfg') @patch('dovetail.test_runner.Container') def test_run_offline_not_exist(self, mock_container, mock_config, mock_utils): @@ -178,50 +119,10 @@ class TestRunnerTesting(unittest.TestCase): docker_runner.logger.error.assert_called_once_with( 'Failed to create container.') - @patch('dovetail.test_runner.dt_cfg') - @patch('dovetail.test_runner.Container') - @patch.object(t_runner.DockerRunner, 'pre_copy') - def test_run__not_offline_src_file_no_precopy(self, mock_precopy, - mock_container, mock_config): - t_runner.VnftestRunner.create_log() - docker_runner = t_runner.VnftestRunner(self.testcase) - mock_config.dovetail_config = { - 'offline': False - } - container_obj = Mock() - docker_img_obj = Mock() - container_obj.get_docker_image.return_value = docker_img_obj - container_obj.pull_image.return_value = True - container_id = '12345' - container_obj.create.return_value = container_id - mock_container.return_value = container_obj - dest_path = 'dest_path' - src_file_name = 'src_file' - exist_file_name = 'exist_src_file' - self.testcase.pre_copy_path.side_effect = [ - dest_path, src_file_name, exist_file_name] - mock_precopy.return_value = False - - docker_runner.run() - - mock_container.assert_called_once_with(self.testcase) - container_obj.get_docker_image.assert_called_once_with() - container_obj.pull_image.assert_called_once_with(docker_img_obj) - container_obj.create.assert_called_once_with(docker_img_obj) - docker_runner.logger.debug.assert_called_with( - 'container id: {}'.format(container_id)) - self.testcase.pre_copy_path.assert_has_calls([ - call(dest_path), - call(src_file_name), - call(exist_file_name)]) - mock_precopy.assert_called_once_with( - container_obj, dest_path, src_file_name, exist_file_name) - @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.dt_cfg') @patch('dovetail.test_runner.Container') - @patch.object(t_runner.DockerRunner, 'pre_copy') - def test_run__not_offline_no_prepare(self, mock_precopy, mock_container, + def test_run__not_offline_no_prepare(self, mock_container, mock_config, mock_utils): t_runner.FunctestRunner.create_log() mock_config.dovetail_config = { @@ -238,12 +139,10 @@ class TestRunnerTesting(unittest.TestCase): container_id = '12345' container_obj.create.return_value = container_id mock_container.return_value = container_obj - self.testcase.pre_copy_path.return_value = None self.testcase.pre_condition.return_value = ['cmd'] self.testcase.prepare_cmd.return_value = False self.testcase.post_condition.return_value = ['cmd'] container_obj.exec_cmd.return_value = (1, 'error') - mock_precopy.return_value = False docker_runner.run() @@ -253,10 +152,6 @@ class TestRunnerTesting(unittest.TestCase): container_obj.create.assert_called_once_with(docker_img_obj) docker_runner.logger.debug.assert_called_with( 'container id: {}'.format(container_id)) - self.testcase.pre_copy_path.assert_has_calls([ - call('dest_path'), - call('src_file'), - call('exist_src_file')]) self.testcase.pre_condition.assert_called_once_with() container_obj.exec_cmd.assert_has_calls([ call('cmd'), call('cmd')]) @@ -271,8 +166,7 @@ class TestRunnerTesting(unittest.TestCase): @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.dt_cfg') @patch('dovetail.test_runner.Container') - @patch.object(t_runner.DockerRunner, 'pre_copy') - def test_run__not_offline_prepare(self, mock_precopy, mock_container, + def test_run__not_offline_prepare(self, mock_container, mock_config, mock_utils): t_runner.FunctestRunner.create_log() mock_config.dovetail_config = { @@ -288,13 +182,11 @@ class TestRunnerTesting(unittest.TestCase): container_id = '12345' container_obj.create.return_value = container_id mock_container.return_value = container_obj - self.testcase.pre_copy_path.return_value = None self.testcase.pre_condition.return_value = ['cmd'] self.testcase.prepare_cmd.return_value = True self.testcase.post_condition.return_value = ['cmd'] self.testcase.cmds = ['cmd'] container_obj.exec_cmd.return_value = (1, 'error') - mock_precopy.return_value = False docker_runner.run() @@ -304,10 +196,6 @@ class TestRunnerTesting(unittest.TestCase): container_obj.create.assert_called_once_with(docker_img_obj) docker_runner.logger.debug.assert_called_with( 'container id: {}'.format(container_id)) - self.testcase.pre_copy_path.assert_has_calls([ - call('dest_path'), - call('src_file'), - call('exist_src_file')]) self.testcase.pre_condition.assert_called_once_with() container_obj.exec_cmd.assert_has_calls([ call('cmd'), call('cmd'), call('cmd')]) @@ -323,9 +211,9 @@ class TestRunnerTesting(unittest.TestCase): @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.os') def test_archive_logs_no_files(self, mock_os, mock_utils, mock_config): - t_runner.FunctestRunner.create_log() + t_runner.VnftestRunner.create_log() mock_config.dovetail_config = {'result_dir': 'result_dir'} - docker_runner = t_runner.FunctestRunner(self.testcase) + docker_runner = t_runner.VnftestRunner(self.testcase) mock_os.environ = {'DOVETAIL_HOME': 'dovetail_home'} mock_utils.get_value_from_dict.return_value = [] diff --git a/dovetail/tests/unit/test_testcase.py b/dovetail/tests/unit/test_testcase.py index e2b0b744..c3eb683e 100644 --- a/dovetail/tests/unit/test_testcase.py +++ b/dovetail/tests/unit/test_testcase.py @@ -239,9 +239,8 @@ class TestcaseTesting(unittest.TestCase): @patch('__builtin__.open') @patch('dovetail.testcase.os.path') @patch('dovetail.testcase.dt_cfg') - @patch.object(tcase.Testcase, 'pre_copy_path') @patch.object(tcase.Testcase, 'sub_testcase') - def test_mk_src_file(self, mock_sub_testcase, mock_pre_copy, mock_config, + def test_mk_src_file(self, mock_sub_testcase, mock_config, mock_path, mock_open): testcase = tcase.Testcase(self.testcase_yaml) logger_obj = Mock() @@ -249,8 +248,6 @@ class TestcaseTesting(unittest.TestCase): mock_config.dovetail_config = {'result_dir': 'value'} sub_test = 'sub_test' file_path = 'file_path' - testcase_src_file = 'testcase_src_file' - mock_pre_copy.return_value = testcase_src_file mock_path.join.return_value = file_path mock_sub_testcase.return_value = [sub_test] file_obj = Mock() @@ -258,8 +255,7 @@ class TestcaseTesting(unittest.TestCase): result = testcase.mk_src_file() - mock_pre_copy.assert_called_once_with('src_file') - mock_path.join.assert_called_once_with('value', testcase_src_file) + mock_path.join.assert_called_once_with('value', 'tempest_custom.txt') mock_open.assert_called_once_with(file_path, 'w+') file_obj.write.assert_called_once_with(sub_test + '\n') logger_obj.debug.assert_has_calls([ @@ -270,9 +266,8 @@ class TestcaseTesting(unittest.TestCase): @patch('__builtin__.open') @patch('dovetail.testcase.os.path') @patch('dovetail.testcase.dt_cfg') - @patch.object(tcase.Testcase, 'pre_copy_path') @patch.object(tcase.Testcase, 'sub_testcase') - def test_mk_src_file_exception(self, mock_sub_testcase, mock_pre_copy, + def test_mk_src_file_exception(self, mock_sub_testcase, mock_config, mock_path, mock_open): testcase = tcase.Testcase(self.testcase_yaml) logger_obj = Mock() @@ -280,16 +275,13 @@ class TestcaseTesting(unittest.TestCase): mock_config.dovetail_config = {'result_dir': 'value'} sub_test = 'sub_test' file_path = 'file_path' - testcase_src_file = 'testcase_src_file' - mock_pre_copy.return_value = testcase_src_file mock_path.join.return_value = file_path mock_sub_testcase.return_value = [sub_test] mock_open.return_value.__enter__.side_effect = Exception() result = testcase.mk_src_file() - mock_pre_copy.assert_called_once_with('src_file') - mock_path.join.assert_called_once_with('value', testcase_src_file) + mock_path.join.assert_called_once_with('value', 'tempest_custom.txt') mock_open.assert_called_once_with(file_path, 'w+') logger_obj.exception('Failed to save: {}'.format(file_path)) self.assertEquals(None, result) @@ -572,14 +564,13 @@ class TestcaseTesting(unittest.TestCase): mock_prepare.return_value = True mock_config.dovetail_config = { 'no_api_validation': True, - 'functest': {'config': {'dir': 'value'}}} + 'functest': {'patches_dir': 'value'}} mock_path.join.return_value = 'patch_cmd' result = testcase.prepare_cmd('type') mock_path.join.assert_called_once_with( - 'value', 'patches', 'functest', 'disable-api-validation', - 'apply.sh') + 'value', 'functest', 'disable-api-validation', 'apply.sh') logger_obj.debug.assert_called_once_with( 'Updated list of commands for test run with ' 'disabled API response validation: {}' diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 5866aa3a..266fb2b6 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -12,6 +12,7 @@ {% endif %} {% set openrc_file = '/tmp/admin_rc.sh' %} {% set result_dir = '/home/opnfv/bottlenecks/results' %} +{% set images_dir = '/home/opnfv/images' %} {% set config_dir = '/home/opnfv/userconfig' %} {% set image_file = '/tmp/yardstick.img' %} @@ -27,12 +28,10 @@ bottlenecks: - '-v {{dovetail_home}}/results/bottlenecks:/tmp' - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}:{{config_dir}}' + - '-v {{dovetail_home}}/images:{{images_dir}}' - '-v {{dovetail_home}}/results:{{result_dir}}' - config: - dir: {{config_dir}} pre_condition: - - 'cp {{config_dir}}/images/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}' + - 'cp {{images_dir}}/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}' cmds: - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} False' post_condition: @@ -40,8 +39,6 @@ bottlenecks: - 'cp /tmp/bottlenecks.log {{result_dir}}' - 'cp /tmp/bottlenecks.stress.ping.out {{result_dir}}' - 'rm {{image_file}}' - result: - dir: {{result_dir}} openrc: {{openrc_file}} extra_container: - 'Bottlenecks-Yardstick' diff --git a/etc/conf/functest-k8s_config.yml b/etc/conf/functest-k8s_config.yml index e717ef94..927af1d7 100644 --- a/etc/conf/functest-k8s_config.yml +++ b/etc/conf/functest-k8s_config.yml @@ -26,6 +26,4 @@ functest-k8s: - 'run_tests -t {{validate_testcase}} -r' post_condition: - 'echo test for postcondition in functest' - result: - dir: {{result_dir}} openrc: {{openrc_file}} diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml index 451b1675..a7b00e60 100644 --- a/etc/conf/functest_config.yml +++ b/etc/conf/functest_config.yml @@ -17,7 +17,8 @@ {% endif %} {% set openrc_file = '/home/opnfv/functest/conf/env_file' %} {% set result_dir = '/home/opnfv/functest/results' %} -{% set config_dir = '/home/opnfv/userconfig' %} +{% set userconfig_dir = '/home/opnfv/userconfig' %} +{% set patches_dir = '/home/opnfv/patches' %} {% set images_dir = '/home/opnfv/functest/images' %} functest: @@ -30,17 +31,16 @@ functest: volumes: - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}:{{config_dir}}' + - '-v {{dovetail_home}}/pre_config:/home/opnfv/pre_config' + - '-v {{dovetail_home}}/userconfig:{{userconfig_dir}}' + - '-v {{dovetail_home}}/patches:{{patches_dir}}' - '-v {{dovetail_home}}/results:{{result_dir}}' - '-v {{dovetail_home}}/images:{{images_dir}}' - config: - dir: {{config_dir}} + patches_dir: {{patches_dir}} pre_condition: - 'echo test for precondition in functest' cmds: - 'run_tests -t {{validate_testcase}} -r' post_condition: - 'echo test for postcondition in functest' - result: - dir: {{result_dir}} openrc: {{openrc_file}} diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index 764ca94b..8f3db551 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -17,8 +17,8 @@ {% set cacert_volume = ' -v ' + cacert + ':' + cacert %} {% endif %} {% set openrc_file = '/etc/yardstick/openstack.creds' %} +{% set pod_file = '/etc/yardstick/pod.yaml' %} {% set result_dir = '/tmp/yardstick' %} -{% set config_dir = '/home/opnfv/userconfig' %} yardstick: image_name: opnfv/yardstick @@ -29,21 +29,18 @@ yardstick: volumes: - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}:{{config_dir}}' + - '-v {{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}' + - '-v {{dovetail_home}}/images:/home/opnfv/images' - '-v {{dovetail_home}}/results:{{result_dir}}' - config: - dir: {{config_dir}} pre_condition: - 'echo this is pre_condition' cmds: - "cd /home/opnfv/repos/yardstick && source {{openrc_file}} && yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml --output-file {{result_dir}}/{{testcase}}.out - --task-args '{'file': '{{config_dir}}/pre_config/pod.yaml', + --task-args '{'file': '{{pod_file}}', 'attack_host': {{attack_host}}, 'attack_process': {{attack_process}}}'" post_condition: - 'echo this is post_condition' - result: - dir: {{result_dir}} openrc: {{openrc_file}} diff --git a/etc/testcase/functest.bgpvpn.router_association.yml b/etc/testcase/functest.bgpvpn.router_association.yml index 0922fb01..f6c56ffa 100644 --- a/etc/testcase/functest.bgpvpn.router_association.yml +++ b/etc/testcase/functest.bgpvpn.router_association.yml @@ -6,11 +6,9 @@ functest.bgpvpn.router_association: type: functest testcase: bgpvpn image_name: opnfv/functest-features - pre_copy: - exist_src_file: sdnvpn_config_testcase4.yaml - dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase4.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml index d27400fb..b1c6cb4d 100644 --- a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml +++ b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml @@ -6,11 +6,9 @@ functest.bgpvpn.router_association_floating_ip: type: functest testcase: bgpvpn image_name: opnfv/functest-features - pre_copy: - exist_src_file: sdnvpn_config_testcase8.yaml - dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase8.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml index 7260ccd8..bb48663e 100644 --- a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml +++ b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml @@ -6,11 +6,9 @@ functest.bgpvpn.subnet_connectivity: type: functest testcase: bgpvpn image_name: opnfv/functest-features - pre_copy: - exist_src_file: sdnvpn_config_testcase1.yaml - dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase1.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.tenant_separation.yml b/etc/testcase/functest.bgpvpn.tenant_separation.yml index efc34fb8..61e768d7 100644 --- a/etc/testcase/functest.bgpvpn.tenant_separation.yml +++ b/etc/testcase/functest.bgpvpn.tenant_separation.yml @@ -6,11 +6,9 @@ functest.bgpvpn.tenant_separation: type: functest testcase: bgpvpn image_name: opnfv/functest-features - pre_copy: - exist_src_file: sdnvpn_config_testcase2.yaml - dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase2.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.security.patrole.yml b/etc/testcase/functest.security.patrole.yml index db1d9e4b..f1234fa6 100644 --- a/etc/testcase/functest.security.patrole.yml +++ b/etc/testcase/functest.security.patrole.yml @@ -6,7 +6,7 @@ functest.security.patrole: type: functest testcase: patrole 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/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.security.patrole_vxlan_dependent.yml b/etc/testcase/functest.security.patrole_vxlan_dependent.yml index f5afa3b4..fd65321e 100644 --- a/etc/testcase/functest.security.patrole_vxlan_dependent.yml +++ b/etc/testcase/functest.security.patrole_vxlan_dependent.yml @@ -6,11 +6,9 @@ functest.security.patrole_vxlan_dependent: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.bgpvpn.yml b/etc/testcase/functest.tempest.bgpvpn.yml index bcac7541..9bf08b11 100644 --- a/etc/testcase/functest.tempest.bgpvpn.yml +++ b/etc/testcase/functest.tempest.bgpvpn.yml @@ -7,11 +7,9 @@ functest.tempest.bgpvpn: testcase: tempest_custom image_name: opnfv/functest-features 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' - 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 + - 'cp /home/opnfv/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/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.compute.yml b/etc/testcase/functest.tempest.compute.yml index 36b4d569..ad71ccc3 100644 --- a/etc/testcase/functest.tempest.compute.yml +++ b/etc/testcase/functest.tempest.compute.yml @@ -6,11 +6,9 @@ functest.tempest.compute: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.identity_v3.yml b/etc/testcase/functest.tempest.identity_v3.yml index 7e64ce19..b53714d6 100644 --- a/etc/testcase/functest.tempest.identity_v3.yml +++ b/etc/testcase/functest.tempest.identity_v3.yml @@ -6,11 +6,9 @@ functest.tempest.identity_v3: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.image.yml b/etc/testcase/functest.tempest.image.yml index d81aa58d..dbfab21b 100644 --- a/etc/testcase/functest.tempest.image.yml +++ b/etc/testcase/functest.tempest.image.yml @@ -6,11 +6,9 @@ functest.tempest.image: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.ipv6_api.yml b/etc/testcase/functest.tempest.ipv6_api.yml index 38a5c8d7..72ffca18 100644 --- a/etc/testcase/functest.tempest.ipv6_api.yml +++ b/etc/testcase/functest.tempest.ipv6_api.yml @@ -6,11 +6,9 @@ functest.tempest.ipv6_api: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.ipv6_scenario.yml b/etc/testcase/functest.tempest.ipv6_scenario.yml index 2378f5e7..4493329b 100644 --- a/etc/testcase/functest.tempest.ipv6_scenario.yml +++ b/etc/testcase/functest.tempest.ipv6_scenario.yml @@ -6,11 +6,9 @@ functest.tempest.ipv6_scenario: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.multi_node_scheduling.yml b/etc/testcase/functest.tempest.multi_node_scheduling.yml index 3f14294a..976c75fc 100644 --- a/etc/testcase/functest.tempest.multi_node_scheduling.yml +++ b/etc/testcase/functest.tempest.multi_node_scheduling.yml @@ -6,11 +6,9 @@ functest.tempest.multi_node_scheduling: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.network_api.yml b/etc/testcase/functest.tempest.network_api.yml index 8d2f53ba..835b87bf 100644 --- a/etc/testcase/functest.tempest.network_api.yml +++ b/etc/testcase/functest.tempest.network_api.yml @@ -6,11 +6,9 @@ functest.tempest.network_api: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.network_scenario.yml b/etc/testcase/functest.tempest.network_scenario.yml index 24511b1d..e9dc0819 100644 --- a/etc/testcase/functest.tempest.network_scenario.yml +++ b/etc/testcase/functest.tempest.network_scenario.yml @@ -6,11 +6,9 @@ functest.tempest.network_scenario: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.network_security.yml b/etc/testcase/functest.tempest.network_security.yml index f2a7f75f..755e7e25 100644 --- a/etc/testcase/functest.tempest.network_security.yml +++ b/etc/testcase/functest.tempest.network_security.yml @@ -6,11 +6,9 @@ functest.tempest.network_security: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.osinterop.yml b/etc/testcase/functest.tempest.osinterop.yml index 124ad419..e0a49fc9 100644 --- a/etc/testcase/functest.tempest.osinterop.yml +++ b/etc/testcase/functest.tempest.osinterop.yml @@ -9,7 +9,7 @@ functest.tempest.osinterop: type: functest 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/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.trunk-ports.yml b/etc/testcase/functest.tempest.trunk-ports.yml index 1b064b2b..a9f5f1fc 100644 --- a/etc/testcase/functest.tempest.trunk-ports.yml +++ b/etc/testcase/functest.tempest.trunk-ports.yml @@ -6,7 +6,7 @@ functest.tempest.neutron_trunk_ports: type: functest testcase: neutron_trunk 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/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.vm_lifecycle.yml b/etc/testcase/functest.tempest.vm_lifecycle.yml index 4bf7b326..f4683305 100644 --- a/etc/testcase/functest.tempest.vm_lifecycle.yml +++ b/etc/testcase/functest.tempest.vm_lifecycle.yml @@ -6,11 +6,9 @@ functest.tempest.vm_lifecycle: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.volume.yml b/etc/testcase/functest.tempest.volume.yml index 62e33956..98be96ee 100644 --- a/etc/testcase/functest.tempest.volume.yml +++ b/etc/testcase/functest.tempest.volume.yml @@ -6,11 +6,9 @@ functest.tempest.volume: type: functest 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/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 + - 'cp /home/opnfv/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/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.vnf.vepc.yml b/etc/testcase/functest.vnf.vepc.yml index 63a48358..7c75f0a2 100644 --- a/etc/testcase/functest.vnf.vepc.yml +++ b/etc/testcase/functest.vnf.vepc.yml @@ -7,7 +7,7 @@ functest.vnf.vepc: testcase: juju_epc image_name: opnfv/functest-vnf pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.vnf.vims.yml b/etc/testcase/functest.vnf.vims.yml index 8217972c..cc9b2a87 100644 --- a/etc/testcase/functest.vnf.vims.yml +++ b/etc/testcase/functest.vnf.vims.yml @@ -7,7 +7,7 @@ functest.vnf.vims: testcase: cloudify_ims image_name: opnfv/functest-vnf pre_condition: - - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' + - 'cp /home/opnfv/userconfig/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/yardstick.ha.neutron_l3_agent.yml b/etc/testcase/yardstick.ha.neutron_l3_agent.yml index 1fb2326d..cf8453e4 100644 --- a/etc/testcase/yardstick.ha.neutron_l3_agent.yml +++ b/etc/testcase/yardstick.ha.neutron_l3_agent.yml @@ -9,13 +9,13 @@ yardstick.ha.neutron_l3_agent: - 'source /etc/yardstick/openstack.creds && openstack --insecure image create neutron-l3-agent_ha_image --disk-format qcow2 --container-format bare --public - --file /home/opnfv/userconfig/images/cirros-0.4.0-x86_64-disk.img && + --file /home/opnfv/images/cirros-0.4.0-x86_64-disk.img && openstack --insecure flavor create --ram 512 --vcpu 1 --disk 1 neutron-l3-agent_ha_flavor' cmds: - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds && yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml --output-file /tmp/yardstick/{{testcase}}.out - --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml', + --task-args '{'file': '/etc/yardstick/pod.yaml', 'image': 'neutron-l3-agent_ha_image', 'flavor': 'neutron-l3-agent_ha_flavor'}'" post_condition: - 'source /etc/yardstick/openstack.creds && |