Skip to content
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.

Sign up for GitHub

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

Apply filtering even if only one package is present in service #10158

Merged
merged 1 commit into from
Mar 9, 2020
Merged

Apply filtering even if only one package is present in service #10158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 16 additions & 17 deletions scripts/devops_tasks/common_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,36 +225,35 @@ def process_glob_string(
# if we have individually queued this specific package, it's obvious that we want to build it specifically
# in this case, do not honor the omission list
if len(collected_directories) == 1:
return filter_for_compatibility(collected_directories)
pkg_set_ci_filtered = filter_for_compatibility(collected_directories)
# however, if there are multiple packages being built, we should honor the omission list and NOT build the omitted
# packages
else:
allowed_package_set = remove_omitted_packages(collected_directories, filter_type)
logging.info(
"Target packages after filtering by omission list: {}".format(
allowed_package_set
)
)

allowed_package_set = remove_omitted_packages(collected_directories)
pkg_set_ci_filtered = filter_for_compatibility(allowed_package_set)
logging.info(
"Package(s) omitted by CI filter: {}".format(
list(set(allowed_package_set) - set(pkg_set_ci_filtered))
)
)

return sorted(pkg_set_ci_filtered)

# Apply filter based on filter type. for e.g. Docs, Regression, Management
pkg_set_ci_filtered = list(filter(omit_funct_dict.get(filter_type, omit_build), pkg_set_ci_filtered))
logging.info(
"Target packages after filtering by CI: {}".format(
pkg_set_ci_filtered
)
)
logging.info(
"Package(s) omitted by CI filter: {}".format(
list(set(collected_directories) - set(pkg_set_ci_filtered))
)
)
return sorted(pkg_set_ci_filtered)

def remove_omitted_packages(collected_directories, filter_type="Build"):

def remove_omitted_packages(collected_directories):
packages = [
package_dir
for package_dir in collected_directories
if os.path.basename(package_dir) not in OMITTED_CI_PACKAGES
]

packages = list(filter(omit_funct_dict.get(filter_type, omit_build), packages))
return packages


Expand Down