diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index 9b6c778371..826aef9074 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -233,7 +233,9 @@ ACLS = { 'commit_flag': 'Flag a commit', "update_watch_status": "Update the watch status on a project", "tag_project": "Allows adding git tags to a project", +{% if env == 'staging' %} "commit": "Commit to a git repository via http(s)", +{% endif %} } REQUIRED_GROUPS = { @@ -264,7 +266,9 @@ USER_ACLS = [ 'pull_request_merge', 'modify_project', 'update_watch_status', +{% if env == 'staging' %} 'commit', +{% endif %} ] CROSS_PROJECT_ACLS = [ @@ -275,7 +279,9 @@ CROSS_PROJECT_ACLS = [ 'pull_request_merge', 'pull_request_flag', 'update_watch_status', +{% if env == 'staging' %} 'commit', +{% endif %} ] ADMIN_API_ACLS = [ diff --git a/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg b/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg index 942b572a9c..44db78e69e 100644 --- a/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg +++ b/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg @@ -18,9 +18,9 @@ namespace = "rpms" name_single = "dummy-test-package-gloster" name_multi_1 = "dummy-test-package-crested" name_multi_2 = "dummy-test-package-rubino" -branch = "master" +branch = "rawhide" pagure_token = "{{ monitor_gating_pagure_token_stg }}" -koji_end_tag = "f34" +koji_end_tag = "f35" {% else %} fedpkg = "fedpkg" @@ -34,7 +34,7 @@ bodhi = "https://bodhi.fedoraproject.org" bodhi-cli = "bodhi" bodhi-user = "packagerbot" bodhi-password = "{{ monitor_gating_packagerbot_pwd_prod }}" -koji_end_tag = "f34" +koji_end_tag = "f35" _env = "prod" _ci_env = "prod" @@ -43,6 +43,6 @@ namespace = "rpms" name_single = "dummy-test-package-gloster" name_multi_1 = "dummy-test-package-crested" name_multi_2 = "dummy-test-package-rubino" -branch = "master" +branch = "rawhide" pagure_token = "{{ monitor_gating_pagure_token_prod }}" {% endif %}