Skip to content

feat: [Foss] Sync public: remove region service exclusion and inclusion list #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 0 additions & 235 deletions integration/config/region_service_exclusion.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions integration/config/region_service_inclusion.yaml

This file was deleted.

10 changes: 6 additions & 4 deletions integration/helpers/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,10 @@ def _get_region():
def _read_test_config_file(filename):
"""Reads test inclusion or exclusion file and returns the contents"""
tests_integ_dir = Path(__file__).resolve().parents[1]
test_config_file_path = str(Path(tests_integ_dir, "config", filename))
test_config = load_yaml(test_config_file_path)
test_config_file_path = Path(tests_integ_dir, "config", filename)
if not test_config_file_path.is_file():
return {}
test_config = load_yaml(str(test_config_file_path))
return test_config


Expand All @@ -164,7 +166,7 @@ def current_region_does_not_support(services):
region = _get_region()
region_exclude_services = _read_test_config_file("region_service_exclusion.yaml")

if region not in region_exclude_services["regions"]:
if region not in region_exclude_services.get("regions", {}):
return False

# check if any one of the services is in the excluded services for current testing region
Expand All @@ -179,7 +181,7 @@ def current_region_not_included(services):
region = _get_region()
region_include_services = _read_test_config_file("region_service_inclusion.yaml")

if region not in region_include_services["regions"]:
if region not in region_include_services.get("regions", {}):
return True

# check if any one of the services is in the excluded services for current testing region
Expand Down