From 8530f530ceb091dea36a01960965ee8ea507240b Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 11 Nov 2025 10:52:18 +0100 Subject: [PATCH 1/4] Add workflow for tagging `konflux-maintainers` on Konflux changes --- .github/workflows/tag-more-reviewers.yaml | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/tag-more-reviewers.yaml diff --git a/.github/workflows/tag-more-reviewers.yaml b/.github/workflows/tag-more-reviewers.yaml new file mode 100644 index 000000000..add71c04d --- /dev/null +++ b/.github/workflows/tag-more-reviewers.yaml @@ -0,0 +1,28 @@ +name: Tag more reviewers + +on: + pull_request: + types: + - review_requested + +jobs: + tag-konflux-maintainers: + # We have lots of PR traffic from MintMaker (acting as `red-hat-konflux[bot]`), and so it's unsustainable to go + # through these emails every day. Therefore, we disabled the notifications for `rhtap-maintainers` team. + # At the same time, we want to be notified when humans, not the bot, request reviews (through CODEOWNERS) for the + # Konflux-related files. This job invites `konflux-maintainers` team for review for such cases. + if: | + github.event.requested_team.name == 'rhtap-maintainers' && + github.event.pull_request.user.login != 'red-hat-konflux[bot]' + env: + GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} + runs-on: ubuntu-latest + steps: + - name: Tag Konflux Maintainers for review + run: | + exec gh api \ + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers" \ + --input - <<< '{ "team_reviewers": [ "konflux-maintainers" ] }' From 7668186bced14a475614b3aa1d693f0bb3926b12 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 18 Nov 2025 18:52:04 +0100 Subject: [PATCH 2/4] Add adjusted codeowners from https://github.com/stackrox/scanner/pull/2412 --- .github/CODEOWNERS | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fa60011c6..48edf7881 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,13 +2,14 @@ # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners # This will automatically assign a team / people as reviewers for PRs based on the files changed within the PR. -* @stackrox/scanner +* @stackrox/scanner @stackrox/release-mgmt-no-email -# The RHTAP maintainers for ACS review all changes related to the Konflux pipelines, such as new +# The Konflux maintainers for ACS review all changes related to the Konflux pipelines, such as new # pipelines, parameter changes or automated task updates as well as Dockerfile updates. -# rhacs-bot auto-approves MintMaker PRs for automated task and security updates. -**/konflux.*Dockerfile @stackrox/rhtap-maintainers @rhacs-bot -/.konflux/ @stackrox/rhtap-maintainers @rhacs-bot -/.tekton/ @stackrox/rhtap-maintainers @rhacs-bot -rpms.* @stackrox/rhtap-maintainers @rhacs-bot -.github/renovate.json5 @stackrox/rhtap-maintainers +# Release engineers need to merge MintMaker PRs at the time of release. +# rhacs-bot needs ability to auto-approve MintMaker PRs for automated task and security updates. +**/konflux.*Dockerfile @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +/.konflux/ @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +/.tekton/ @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +rpms.* @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +.github/renovate.json5 @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email From b122c370b73bdea725e806cd8657a5fde35a6eca Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 18 Nov 2025 18:55:47 +0100 Subject: [PATCH 3/4] Adjust workflow for new team names --- .github/workflows/tag-more-reviewers.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tag-more-reviewers.yaml b/.github/workflows/tag-more-reviewers.yaml index add71c04d..f4233751c 100644 --- a/.github/workflows/tag-more-reviewers.yaml +++ b/.github/workflows/tag-more-reviewers.yaml @@ -8,11 +8,13 @@ on: jobs: tag-konflux-maintainers: # We have lots of PR traffic from MintMaker (acting as `red-hat-konflux[bot]`), and so it's unsustainable to go - # through these emails every day. Therefore, we disabled the notifications for `rhtap-maintainers` team. - # At the same time, we want to be notified when humans, not the bot, request reviews (through CODEOWNERS) for the - # Konflux-related files. This job invites `konflux-maintainers` team for review for such cases. + # through these emails every day. Therefore, the notifications are disabled for `konflux-maintainers-no-email` + # team that's set as owner in CODEOWNERS for the Konflux stuff. + # At the same time, we want to be notified when humans, not the bot, request reviews (which happens automatically + # again through CODEOWNERS) for the Konflux-related files. This job invites `konflux-maintainers` team for review + # for such cases. if: | - github.event.requested_team.name == 'rhtap-maintainers' && + github.event.requested_team.name == 'konflux-maintainers-no-email' && github.event.pull_request.user.login != 'red-hat-konflux[bot]' env: GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} From 700ad34a3a3ddca7d00ab070cc2338d425dbc812 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Thu, 20 Nov 2025 11:15:01 +0100 Subject: [PATCH 4/4] Take out release managers from all-approvers --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 48edf7881..36d2d0958 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,7 +2,7 @@ # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners # This will automatically assign a team / people as reviewers for PRs based on the files changed within the PR. -* @stackrox/scanner @stackrox/release-mgmt-no-email +* @stackrox/scanner # The Konflux maintainers for ACS review all changes related to the Konflux pipelines, such as new # pipelines, parameter changes or automated task updates as well as Dockerfile updates.