Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable delete_branch_on_merge for AQA test repos #72

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

llxia
Copy link
Contributor

@llxia llxia commented Dec 4, 2024

@llxia llxia requested a review from a team as a code owner December 4, 2024 15:59
Copy link

This is your friendly self-service bot.

Thank you for raising a pull request to update the configuration of your GitHub organization.
You can manually add reviewers to this PR to eventually enable auto-merging.

The following conditions need to fulfilled for auto-merging to be available:

  • valid configuration
  • approved by a project lead
  • does not require any secrets
  • does not update settings only accessible via the GitHub Web UI
  • does not remove any resource
Otterdog commands and options

You can trigger otterdog actions by commenting on this PR:

  • /otterdog team-info checks the team / org membership for the PR author
  • /otterdog validate validates the configuration change
  • /otterdog validate info validates the configuration change, printing also validation infos
  • /otterdog check-sync checks if the base ref is in sync with live settings
  • /otterdog merge merges and applies the changes if the PR is eligible for auto-merging (only accessible for the author)
  • /otterdog done notifies the self-service bot that a required manual apply operation has been performed (only accessible for members of the admin team)
  • /otterdog apply re-apply a previously failed attempt (only accessible for members of the admin team)

Copy link

This is your friendly self-service bot.

The author (llxia) of this PR is associated with this organization in the role of MEMBER.

Additionally, llxia is a member of the following teams:

This comment has been minimized.

@llxia llxia requested a review from smlambert December 4, 2024 15:59
Copy link

This is your friendly self-service bot. The current configuration is in-sync with the live settings. 🚀

Copy link

This is your friendly self-service bot.
This Pull Request is eligible for auto-merging as it passed the following checks:

  • valid configuration
  • approved by a project lead
  • does not require any secrets
  • does not update settings only accessible via the GitHub Web UI
  • does not remove any resource

In order to automatically merge and apply the changes, add a comment /otterdog merge. 🚀

Signed-off-by: Thomas Neidhart <[email protected]>
Copy link

This is your friendly self-service bot.
Please find below the validation of the requested configuration changes:

Diff for 881cc21
Project adoptium[github_id=adoptium]
  there have been 4 validation infos, enable verbose output to display them.

  
!   repository[name="STF"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="TKG"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-systemtest"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-test-tools"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-tests"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="openj9-systemtest"] {
!     delete_branch_on_merge = false -> true
!   }
  
  Plan: 0 to add, 6 to change, 0 to delete.

Copy link
Contributor

@netomi netomi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @llxia !

@smlambert
Copy link
Contributor

smlambert commented Dec 4, 2024

Apparently I have either lost write access or never had write permissions to this repo so can not merge this.

@netomi - Who should have write access to this repo? Adoptium PMC members? Or is it restricted?

I see https://github.com/orgs/adoptium/teams/eclipsefdn-security and also expect project security teams should have permissions for updating this configuration.

@netomi
Copy link
Contributor

netomi commented Dec 4, 2024

In order to automatically merge and apply the changes, add a comment /otterdog merge. 🚀

@smlambert
Copy link
Contributor

/otterdog merge

@eclipse-otterdog eclipse-otterdog bot merged commit 49e56ee into adoptium:main Dec 4, 2024
3 checks passed
Copy link

This is your friendly self-service bot.

The following changes have been successfully applied:

Project adoptium[github_id=adoptium]
  there have been 4 validation infos, enable verbose output to display them.

  
!   repository[name="STF"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="TKG"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-systemtest"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-test-tools"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="aqa-tests"] {
!     delete_branch_on_merge = false -> true
!   }

  
!   repository[name="openj9-systemtest"] {
!     delete_branch_on_merge = false -> true
!   }

  
  Applying changes:
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100% 0:00:00
  
  Done.
  
  Executed plan: 0 added, 6 changed, 0 deleted.

@smlambert
Copy link
Contributor

thanks @netomi - the more words and help I am offered by bots, the less likely I am to read them... :) appreciate your patient guidance!

@netomi
Copy link
Contributor

netomi commented Dec 4, 2024

it becomes repetitive after some time, maybe if an org had already more than x number of PRs, only let the bot say the minimum required stuff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Propose to turn on Automatically delete head branches
3 participants