Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into copr_mail2

Browse source
This commit is contained in:
Stephen Smoogen 2021-02-18 12:24:42 -05:00
commit d0cc759dc6
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/distgit/pagure/templates/pagure.cfg
View file

@ -233,7 +233,9 @@ ACLS = {
'commit_flag': 'Flag a commit', 'commit_flag': 'Flag a commit',
"update_watch_status": "Update the watch status on a project", "update_watch_status": "Update the watch status on a project",
"tag_project": "Allows adding git tags to a project", "tag_project": "Allows adding git tags to a project",
{% if env == 'staging' %}
"commit": "Commit to a git repository via http(s)", "commit": "Commit to a git repository via http(s)",
{% endif %}
} }
REQUIRED_GROUPS = { REQUIRED_GROUPS = {
@ -264,7 +266,9 @@ USER_ACLS = [
'pull_request_merge', 'pull_request_merge',
'modify_project', 'modify_project',
'update_watch_status', 'update_watch_status',
{% if env == 'staging' %}
'commit', 'commit',
{% endif %}
] ]
CROSS_PROJECT_ACLS = [ CROSS_PROJECT_ACLS = [
@ -275,7 +279,9 @@ CROSS_PROJECT_ACLS = [
'pull_request_merge', 'pull_request_merge',
'pull_request_flag', 'pull_request_flag',
'update_watch_status', 'update_watch_status',
{% if env == 'staging' %}
'commit', 'commit',
{% endif %}
] ]
ADMIN_API_ACLS = [ ADMIN_API_ACLS = [

8
roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg
View file

@ -18,9 +18,9 @@ namespace = "rpms"
name_single = "dummy-test-package-gloster" name_single = "dummy-test-package-gloster"
name_multi_1 = "dummy-test-package-crested" name_multi_1 = "dummy-test-package-crested"
name_multi_2 = "dummy-test-package-rubino" name_multi_2 = "dummy-test-package-rubino"
branch = "master" branch = "rawhide"
pagure_token = "{{ monitor_gating_pagure_token_stg }}" pagure_token = "{{ monitor_gating_pagure_token_stg }}"
koji_end_tag = "f34" koji_end_tag = "f35"
{% else %} {% else %}
fedpkg = "fedpkg" fedpkg = "fedpkg"
@ -34,7 +34,7 @@ bodhi = "https://bodhi.fedoraproject.org"
bodhi-cli = "bodhi" bodhi-cli = "bodhi"
bodhi-user = "packagerbot" bodhi-user = "packagerbot"
bodhi-password = "{{ monitor_gating_packagerbot_pwd_prod }}" bodhi-password = "{{ monitor_gating_packagerbot_pwd_prod }}"
koji_end_tag = "f34" koji_end_tag = "f35"
_env = "prod" _env = "prod"
_ci_env = "prod" _ci_env = "prod"
@ -43,6 +43,6 @@ namespace = "rpms"
name_single = "dummy-test-package-gloster" name_single = "dummy-test-package-gloster"
name_multi_1 = "dummy-test-package-crested" name_multi_1 = "dummy-test-package-crested"
name_multi_2 = "dummy-test-package-rubino" name_multi_2 = "dummy-test-package-rubino"
branch = "master" branch = "rawhide"
pagure_token = "{{ monitor_gating_pagure_token_prod }}" pagure_token = "{{ monitor_gating_pagure_token_prod }}"
{% endif %} {% endif %}