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

feat: compare changes in current with master branch to get selectors #3826

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

Skisocks
Copy link
Contributor

Previously only the most recent commit was used to identify changes to a helmfile and identify the selectors to use. This caused issues where if a second commit was made altering a different helmfile then the first helmfile would be ignored. This is fixed by comparing changes to the helmfiles in the current branch with what is currently in the default branch.

The --allow-no-matching-release flag has also been added. This stops the templating from erroring in the case where a namespace is removed (selector applied to the helmfile flags no longer exists).

@jenkins-x-bot
Copy link
Contributor

Hi @Skisocks. Thanks for your PR.

I'm waiting for a jenkins-x member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the jenkins-x/lighthouse repository.

@Skisocks
Copy link
Contributor Author

/cc @msvticket

@jenkins-x-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign msvticket
You can assign the PR to them by writing /assign @msvticket in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Member

@msvticket msvticket left a comment

Choose a reason for hiding this comment

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

While this already is an improvement there is another case I'd like you to handle:
A change has been made to another helmfile the "master" branch. That is you should consider all files that differ between the PR branch and master.

We are really only interested in those changes that have not been regenerated, but it is quite tricky to find out.

So you could use this git log command:

git log $defaultBranch...HEAD --name-only --pretty=format:

And then there is another case I don't see is considered: that the script isn't run on a PR branch, but on master.

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

Successfully merging this pull request may close these issues.

None yet

3 participants