From 6047e2fd3c743307e4aec97cb753c272903d2850 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jan 14 2020 14:21:01 +0000 Subject: Update Pagure config project helper according to recents changes --- diff --git a/tools/project-settings-helper/helper.py b/tools/project-settings-helper/helper.py index cc1edd6..0c05fe9 100755 --- a/tools/project-settings-helper/helper.py +++ b/tools/project-settings-helper/helper.py @@ -70,7 +70,10 @@ class PagureAPIClient(): def set_tags(self, project, params): # This endpoint does not exists yet # https://pagure.io/pagure/issue/4663 - pass + logging.warning( + "The PR tag %s has not been defined due to " + "https://pagure.io/pagure/issue/4663 only in Pagure >= 5.9" % ( + params)) # path = '%s/tags/update' % project # resp = self.post(self.base_url + path, params) # self._manage_error(*resp) @@ -84,17 +87,19 @@ def set_zuul_settings(client, project, gating, host): config['pull_requests'] = True config['notify_on_pull-request_flag'] = True if gating: + config['Minimum_score_to_merge_pull-request'] = 0 config['open_metadata_access_to_all'] = False - # Cannot set 0 by the API so let's force it to -1 - # Then https://review.opendev.org/#/c/691254/ is needed asap. - config['Minimum_score_to_merge_pull-request'] = -1 client.set_tags(project, ['gateit']) + # convert value https://pagure.io/pagure/issue/4712 + for k, v in config.items(): + if isinstance(v, bool): + config[k] = 1 if v else 0 client.set_config(project, config) logging.debug("Applying new setting set on %s" % project) acls = { 'user_type': 'user', 'name': 'zuul', - 'acl': 'admin' + 'acl': 'commit' } client.set_acl(project, acls) logging.debug("Adding zuul user as admin on %s" % project)