From e21a1e74a94a3e3fc1046cba44e905cbdbc2db6a Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Thu, 8 Jun 2023 18:07:08 +0000 Subject: [PATCH 1/3] Fixing missing required approvals in generate script for gitcontrol --- tools/generate_doc_gitcontrol_repos.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/generate_doc_gitcontrol_repos.py b/tools/generate_doc_gitcontrol_repos.py index bcb63a76..119354bd 100644 --- a/tools/generate_doc_gitcontrol_repos.py +++ b/tools/generate_doc_gitcontrol_repos.py @@ -35,6 +35,7 @@ def process_services(args, services): status_check_contexts=["gl/check"], enable_merge_whitelist=True, merge_whitelist_usernames=["zuul"], + required_approvals=1, ) gitea_repo_template = dict( default_branch="main", @@ -61,6 +62,7 @@ def process_services(args, services): status_check_contexts=["gl/check"], enable_merge_whitelist=True, merge_whitelist_usernames=["zuul"], + required_approvals=1 ) github_repo_template = dict( default_branch="main", -- 2.34.1 From bd842539535c458fbfd1525a5715a06333a2384e Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Thu, 8 Jun 2023 18:10:14 +0000 Subject: [PATCH 2/3] Update 'tools/generate_doc_gitcontrol_repos.py' --- tools/generate_doc_gitcontrol_repos.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/generate_doc_gitcontrol_repos.py b/tools/generate_doc_gitcontrol_repos.py index 119354bd..baa180c8 100644 --- a/tools/generate_doc_gitcontrol_repos.py +++ b/tools/generate_doc_gitcontrol_repos.py @@ -32,6 +32,7 @@ def process_services(args, services): block_on_rejected_reviews=True, dismiss_stale_approvals=True, enable_push=False, + enable_status_check=True, status_check_contexts=["gl/check"], enable_merge_whitelist=True, merge_whitelist_usernames=["zuul"], @@ -59,6 +60,7 @@ def process_services(args, services): block_on_rejected_reviews=True, dismiss_stale_approvals=True, enable_push=False, + enable_status_check=True, status_check_contexts=["gl/check"], enable_merge_whitelist=True, merge_whitelist_usernames=["zuul"], -- 2.34.1 From 568110ed6b84b9076e5f0ab9820a038fca2ae53d Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Thu, 8 Jun 2023 18:15:47 +0000 Subject: [PATCH 3/3] Update 'tools/generate_doc_gitcontrol_repos.py' --- tools/generate_doc_gitcontrol_repos.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/generate_doc_gitcontrol_repos.py b/tools/generate_doc_gitcontrol_repos.py index baa180c8..b8e344f7 100644 --- a/tools/generate_doc_gitcontrol_repos.py +++ b/tools/generate_doc_gitcontrol_repos.py @@ -60,11 +60,9 @@ def process_services(args, services): block_on_rejected_reviews=True, dismiss_stale_approvals=True, enable_push=False, - enable_status_check=True, status_check_contexts=["gl/check"], enable_merge_whitelist=True, merge_whitelist_usernames=["zuul"], - required_approvals=1 ) github_repo_template = dict( default_branch="main", -- 2.34.1