Sync ansible-pcp git subtree

[github-actions]

Automated sync of ansible-pcp git subtree from upstream repository. This PR contains the latest changes from https://github.com/performancecopilot/ansible-pcp.git

[sfeifer]

@richm Adding the github-actions[bot] to the CODEOWNERS file did not work as I expected. Running the workflow in my fork, I get the error that the action cannot approve a PR it created itself.

I see that the run last night did not need a code review (setting was turned off), but still failed at auto merging even with the --admin flag. This leads me to the conclusion that a github action cannot automatically create and merge the PR without someone else's approval (when an approval is required).

As is, the action creates a PR that needs to be approved and then merged by a reviewer. Assuming we want to keep the branch protection rules, the other option would be going back to the old version of the workflow file and manually turning off the branch protection rules when we want to run the github action. Which one of these works best for you?

I can clean up the workflow file so it just creates the PR (does not fail trying to merge) if that is the preferred solution.

[richm]

@richm Adding the github-actions[bot] to the CODEOWNERS file did not work as I expected. Running the workflow in my fork, I get the error that the action cannot approve a PR it created itself.

I see that the run last night did not need a code review (setting was turned off), but still failed at auto merging even with the --admin flag. This leads me to the conclusion that a github action cannot automatically create and merge the PR without someone else's approval (when an approval is required).

As is, the action creates a PR that needs to be approved and then merged by a reviewer.

Which would be fine - but even after review, it still says This branch cannot be rebased due to conflicts because the trees are somehow not in sync. I'm not sure how to fix this.

Assuming we want to keep the branch protection rules, the other option would be going back to the old version of the workflow file and manually turning off the branch protection rules when we want to run the github action. Which one of these works best for you?

I can clean up the workflow file so it just creates the PR (does not fail trying to merge) if that is the preferred solution.

Sure, you can try that, but I'm afraid we will get the This branch cannot be rebased due to conflicts unless we can figure out how to correctly rebase the branch used by the PR.

[sfeifer]

Sure, you can try that, but I'm afraid we will get the This branch cannot be rebased due to conflicts unless we can figure out how to correctly rebase the branch used by the PR.

When I go to merge one of the PR's that has been approved (i.e. #256), I am able to merge without conflicts using either the "squash and merge" or "create a merge commit" options. The only time I see the conflict is when trying to use the "rebase and merge" option. I access these options by clicking the down arrow next to the grayed out merge button.

Is this what you are seeing too?