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

[6.17.z] Update dependancy-merge workflow as for other z-stream branches #17654

Merged

Conversation

Gauravtalreja1
Copy link
Collaborator

Problem Statement

dependancy-merge GHA using same configuration as the master causing failure in the automerge.

Solution

Update dependancy-merge workflow as for other z-stream branches

Related Issues

Skipped workflow - https://github.com/SatelliteQE/robottelo/actions/runs/13440837741/job/37554615946?pr=17650
Previously handled for 6.16.z in - #16504

@Gauravtalreja1 Gauravtalreja1 added No-CherryPick PR doesnt need CherryPick to previous branches 6.17.z labels Feb 20, 2025
@Gauravtalreja1 Gauravtalreja1 self-assigned this Feb 20, 2025
@Gauravtalreja1 Gauravtalreja1 requested a review from a team as a code owner February 20, 2025 18:30
@JacobCallahan
Copy link
Member

@Gauravtalreja1 can you elaborate on what the problem being solved here is?

@Gauravtalreja1
Copy link
Collaborator Author

@JacobCallahan Sure, We've different dependancy automerge GHA for master and zstream branches, so for example if you see GHA of master branch you'd find dependancy PRs opened from dependabot user which we check with if: github.event.pull_request.user.login == 'dependabot[bot]', but in case of Zstream branches, it would be cherrypicked by our automation/bot user, so in case zstream branches we just check if dependencies label is added to the cherrypicked PRs.
For example, workflow linked in the description is skipped because the PR is not opened by dependabot user

@jyejare jyejare force-pushed the dependancy-merge-617z branch from edb071c to 2f39fc1 Compare February 25, 2025 09:13
@jyejare
Copy link
Member

jyejare commented Feb 25, 2025

@Gauravtalreja1 @ogajduse We also need to update the automatic branching logic to do this change everytime. No need to do in this PR though.

@jyejare jyejare enabled auto-merge (squash) February 25, 2025 09:15
@Gauravtalreja1 Gauravtalreja1 merged commit 21b8e36 into SatelliteQE:6.17.z Feb 25, 2025
8 checks passed
@Gauravtalreja1 Gauravtalreja1 deleted the dependancy-merge-617z branch February 25, 2025 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.17.z No-CherryPick PR doesnt need CherryPick to previous branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants