From a4f51fc947728110958d76a99a007da162d3ed75 Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Mon, 23 Mar 2020 10:00:11 -0700 Subject: [PATCH 1/4] Skip service fabric from verify change log --- scripts/devops_tasks/verify_change_log.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/devops_tasks/verify_change_log.py b/scripts/devops_tasks/verify_change_log.py index 687d549dd3ae..f8968f387c66 100644 --- a/scripts/devops_tasks/verify_change_log.py +++ b/scripts/devops_tasks/verify_change_log.py @@ -15,13 +15,15 @@ from common_tasks import process_glob_string, parse_setup, run_check_call -excluded_packages = ["azure"] logging.getLogger().setLevel(logging.INFO) root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..")) psscript = os.path.join(root_dir, "scripts", "devops_tasks", "find_change_log.ps1") +# Service fabric change log name is History.md and as per the discussion with language team this should not be renamed to CHANGELOG.md +# This script looks for "CHANGELOG.md" and fails if it is not found in package +NON_STANDARD_CHANGE_LOG_PACKAGES = ["azure-servicefabric",] def find_change_log(targeted_package, version): # Execute powershell script to find a matching version in change log @@ -58,7 +60,7 @@ def verify_packages(targeted_packages): pkg_name, version, _, _ = parse_setup(package) # Skip management packages - if "-mgmt" in pkg_name or pkg_name in excluded_packages: + if "-mgmt" in pkg_name or pkg_name in NON_STANDARD_CHANGE_LOG_PACKAGES: continue if not find_change_log(package, version): From 3650ac747f90bcede5b60cf9ed172bc6233ca7bc Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Mon, 23 Mar 2020 10:21:09 -0700 Subject: [PATCH 2/4] Updated comments --- scripts/devops_tasks/verify_change_log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/devops_tasks/verify_change_log.py b/scripts/devops_tasks/verify_change_log.py index f8968f387c66..786fd2e40fe0 100644 --- a/scripts/devops_tasks/verify_change_log.py +++ b/scripts/devops_tasks/verify_change_log.py @@ -21,8 +21,8 @@ root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..")) psscript = os.path.join(root_dir, "scripts", "devops_tasks", "find_change_log.ps1") -# Service fabric change log name is History.md and as per the discussion with language team this should not be renamed to CHANGELOG.md -# This script looks for "CHANGELOG.md" and fails if it is not found in package +# Service fabric change log has non standard versioning for e.g 7.0.0.0 +# Verify change log should skip this package since this script looks for standard version format of x.y.z NON_STANDARD_CHANGE_LOG_PACKAGES = ["azure-servicefabric",] def find_change_log(targeted_package, version): From d758477617703a66c7abba8b0145a364f61339a9 Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Mon, 23 Mar 2020 10:58:42 -0700 Subject: [PATCH 3/4] Added additional comment --- scripts/devops_tasks/verify_change_log.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/devops_tasks/verify_change_log.py b/scripts/devops_tasks/verify_change_log.py index 786fd2e40fe0..593c273304e0 100644 --- a/scripts/devops_tasks/verify_change_log.py +++ b/scripts/devops_tasks/verify_change_log.py @@ -60,6 +60,7 @@ def verify_packages(targeted_packages): pkg_name, version, _, _ = parse_setup(package) # Skip management packages + # Skipping azure-servicefabric due to non-standard version format(e.g. 7.0.0.0) for the package if "-mgmt" in pkg_name or pkg_name in NON_STANDARD_CHANGE_LOG_PACKAGES: continue From 0be4ae14a2bb8d8f8e4b5ab1e66af91e5bd417ce Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Mon, 23 Mar 2020 13:04:03 -0700 Subject: [PATCH 4/4] Added logging --- scripts/devops_tasks/verify_change_log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/devops_tasks/verify_change_log.py b/scripts/devops_tasks/verify_change_log.py index 593c273304e0..63480b4d4578 100644 --- a/scripts/devops_tasks/verify_change_log.py +++ b/scripts/devops_tasks/verify_change_log.py @@ -59,9 +59,9 @@ def verify_packages(targeted_packages): # Parse setup.py using common helper method to get version and package name pkg_name, version, _, _ = parse_setup(package) - # Skip management packages - # Skipping azure-servicefabric due to non-standard version format(e.g. 7.0.0.0) for the package + # Skip management packages and any explicitly excluded packages if "-mgmt" in pkg_name or pkg_name in NON_STANDARD_CHANGE_LOG_PACKAGES: + logging.info("Skipping {} due to known exclusion in change log verification".format(pkg_name)) continue if not find_change_log(package, version):