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

Run sanity checks on PR base branch change #1715

Merged

Conversation

alfonsomthd
Copy link
Collaborator

@alfonsomthd alfonsomthd commented Nov 26, 2024

The pull_request edited event type is the only one that detects a change in the base branch, so we're adding it to the list of event types to prevent the following scenarios:

  • When updating the base branch, no sanity-checks are run.
  • Successful sanity-checks runs on the previous branch that are kept when base branch is updated: misleading (we don't know if they would have failed against the new base branch).

NOTE: the side effect is when editing the title or PR description, sanity-checks will be re-triggered. Although not ideal, it's better than adding a condition on the job to not run it on title/description changes, as the job is marked as skipped: misleading (we don't know if the previous run was successful or not).

@alfonsomthd alfonsomthd changed the title Run sanity checks on base branch change Run sanity checks on PR base branch change Nov 26, 2024
@alfonsomthd alfonsomthd changed the base branch from master to release-4.18 November 26, 2024 09:33
@alfonsomthd alfonsomthd changed the base branch from release-4.18 to master November 26, 2024 09:41
@alfonsomthd alfonsomthd changed the base branch from master to release-4.18 November 26, 2024 09:51
@alfonsomthd alfonsomthd changed the base branch from release-4.18 to master November 26, 2024 09:53
@alfonsomthd alfonsomthd changed the title Run sanity checks on PR base branch change Run sanity checks on PR base branch change Nov 26, 2024
@alfonsomthd alfonsomthd changed the base branch from master to release-4.18 November 26, 2024 10:35
@alfonsomthd alfonsomthd changed the base branch from release-4.18 to master November 26, 2024 15:24
on:
push:
branches: [master]
pull_request:
branches: [master, release*]
types: [opened, synchronize, reopened, edited]
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The event types preceding edited are the default ones.

Copy link
Contributor

@GowthamShanmugam GowthamShanmugam Nov 26, 2024

Choose a reason for hiding this comment

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

what is When updating the base branch, no sanity-checks are run means?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Currently (before this PR), when you change the base branch (i.e. from master to release-.x.x) the sanity checks (build, lint, unit tests, etc) are not run, only the E2E tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

ack

@alfonsomthd
Copy link
Collaborator Author

/retest

@GowthamShanmugam
Copy link
Contributor

/approve

@GowthamShanmugam
Copy link
Contributor

cc: @SanjalKatiyar and @bipuladh to tag

@SanjalKatiyar
Copy link
Collaborator

/lgtm

Copy link
Contributor

openshift-ci bot commented Nov 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alfonsomthd, GowthamShanmugam, SanjalKatiyar

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [GowthamShanmugam,SanjalKatiyar,alfonsomthd]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 2d49e49 into red-hat-storage:master Nov 27, 2024
11 checks passed
@alfonsomthd
Copy link
Collaborator Author

cc: @SanjalKatiyar and @bipuladh to tag

@SanjalKatiyar @bipuladh ping.

@alfonsomthd
Copy link
Collaborator Author

cc: @SanjalKatiyar and @bipuladh to tag

@SanjalKatiyar @bipuladh ping.

Please ignore the ping.

@alfonsomthd
Copy link
Collaborator Author

/cherrypick release-4.18 release-4.18-compatibility

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1733

In response to this:

/cherrypick release-4.18 release-4.18-compatibility

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 kubernetes-sigs/prow repository.

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.17

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.17-compatibility

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.16

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.16-compatibility

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1734

In response to this:

/cherry-pick release-4.17

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 kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1735

In response to this:

/cherry-pick release-4.17-compatibility

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 kubernetes-sigs/prow repository.

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.15

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.15-compatibility

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1736

In response to this:

/cherry-pick release-4.16

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 kubernetes-sigs/prow repository.

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.14-compatibility

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1737

In response to this:

/cherry-pick release-4.16-compatibility

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 kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1738

In response to this:

/cherry-pick release-4.15

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 kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1739

In response to this:

/cherry-pick release-4.15-compatibility

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 kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@alfonsomthd: #1715 failed to apply on top of branch "release-4.14-compatibility":

Applying: Run sanity checks on base branch change
Using index info to reconstruct a base tree...
M	.github/workflows/frontend-build.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/frontend-build.yml
CONFLICT (content): Merge conflict in .github/workflows/frontend-build.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Run sanity checks on base branch change

In response to this:

/cherry-pick release-4.14-compatibility

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 kubernetes-sigs/prow repository.

@alfonsomthd
Copy link
Collaborator Author

/cherry-pick release-4.18-compatibility

@openshift-cherrypick-robot

@alfonsomthd: new pull request created: #1742

In response to this:

/cherry-pick release-4.18-compatibility

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 kubernetes-sigs/prow repository.

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.

4 participants