diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 4 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 3 | ||||
| -rw-r--r-- | functest/ci/run_tests.py | 35 |
3 files changed, 2 insertions, 40 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index a3f029a0..a87fe25b 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -12,8 +12,8 @@ os: snaps: images: glance_tests: - disk_file: / - home/opnfv/functest/images/cirros-d161201-aarch64-disk.img + disk_file: + /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img extra_properties: hw_firmware_type: 'uefi' short_id: 'ubuntu16.04' diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index f54c2d7c..b6ba9790 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -6,9 +6,6 @@ lxd: image_file_name: cirros-0.3.5-x86_64-lxc.tar.gz image_disk_format: raw - healthcheck: - disk_image: /home/opnfv/functest/data/cirros-0.3.5-x86_64-lxc.tar.gz - disk_format: raw fdio: general: flavor_extra_specs: {'hw:mem_page_size':'large'} diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index 67a6f142..b8da3be6 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -20,7 +20,6 @@ import textwrap import prettytable import six -import yaml import functest.ci.tier_builder as tb import functest.core.testcase as testcase @@ -33,13 +32,6 @@ logger = logging.getLogger('functest.ci.run_tests') CONFIG_FUNCTEST_PATH = pkg_resources.resource_filename( 'functest', 'ci/config_functest.yaml') -CONFIG_PATCH_PATH = pkg_resources.resource_filename( - 'functest', 'ci/config_patch.yaml') -CONFIG_AARCH64_PATCH_PATH = pkg_resources.resource_filename( - 'functest', 'ci/config_aarch64_patch.yaml') -# set the architecture to default -pod_arch = os.getenv("POD_ARCH", None) -arch_filter = ['aarch64'] class Result(enum.Enum): @@ -88,31 +80,6 @@ class Runner(object): pkg_resources.resource_filename('functest', 'ci/testcases.yaml')) @staticmethod - def update_config_file(): - Runner.patch_file(CONFIG_PATCH_PATH) - - if pod_arch and pod_arch in arch_filter: - Runner.patch_file(CONFIG_AARCH64_PATCH_PATH) - - @staticmethod - def patch_file(patch_file_path): - logger.debug('Updating file: %s', patch_file_path) - with open(patch_file_path) as f: - patch_file = yaml.safe_load(f) - - updated = False - for key in patch_file: - if key in CONST.__getattribute__('DEPLOY_SCENARIO'): - new_functest_yaml = dict(ft_utils.merge_dicts( - ft_utils.get_functest_yaml(), patch_file[key])) - updated = True - - if updated: - os.remove(CONFIG_FUNCTEST_PATH) - with open(CONFIG_FUNCTEST_PATH, "w") as f: - f.write(yaml.dump(new_functest_yaml, default_style='"')) - - @staticmethod def source_rc_file(): rc_file = CONST.__getattribute__('openstack_creds') if not os.path.isfile(rc_file): @@ -229,8 +196,6 @@ class Runner(object): self.run_tier(tier) def main(self, **kwargs): - Runner.update_config_file() - if 'noclean' in kwargs: self.clean_flag = not kwargs['noclean'] if 'report' in kwargs: |