From d0a8837c0750ab54948a5a8f39486ea34711228c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 18 Feb 2021 09:24:18 +0100
Subject: [PATCH 1/2] distgit/pagure: remove the commit ACL for API keys in
 prod

This ACL turns out to be too confusing to users as it currently
does not work with our OIDC set-up with fedpkg.
Once we'll have figured out how to make both work together or
keep one and remove the other, we can revisit.

Keeping this in staging so we have a place where we can experiment
with this.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/distgit/pagure/templates/pagure.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

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 = [

From 333568717344fb02336818c3d7cb60de43573e83 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Thu, 18 Feb 2021 10:35:03 +0100
Subject: [PATCH 2/2] Updating monitor-gating to work on new branch and look
 for latest rawhide tag.

---
 .../monitor-gating/templates/monitor_gating.cfg           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 %}