Skip to content

Commit 6706921

Browse files
authored
Merge branch 'master' into sync4
2 parents a3dad4f + 6c01901 commit 6706921

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

src/clusterfuzz/_internal/cron/oss_fuzz_cc_groups.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def sync_project_cc_group(project_name, info):
7272

7373
def main():
7474
"""Sync OSS-Fuzz projects groups used to CC owners in the issue tracker."""
75+
logs.info('OSS-Fuzz CC groups sync started.')
7576
projects = project_setup.get_oss_fuzz_projects()
7677

7778
for project, info in projects:

src/clusterfuzz/_internal/google_cloud_utils/google_groups.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ def create_google_group(group_name: str,
117117
"""Create a google group."""
118118
identity_service = get_identity_api()
119119

120-
customer_id = customer_id or str(
121-
local_config.ProjectConfig().get('groups_customer_id'))
120+
customer_id = customer_id or local_config.ProjectConfig().get(
121+
'groups_customer_id')
122122
if not customer_id:
123123
logs.error('No customer ID set. Unable to create a new google group.')
124124
return None

src/clusterfuzz/_internal/k8s/job_template.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,5 @@ spec:
8585
emptyDir:
8686
medium: Memory
8787
sizeLimit: 1.9Gi
88-
{% if is_kata %}
89-
nodeSelector:
90-
cloud.google.com/gke-nodepool: kata-enabled-pool
91-
{% endif %}
9288
restartPolicy: "{{restart_policy}}"
93-
backoffLimit: 0
89+
backoffLimit: 0

0 commit comments

Comments
 (0)