Skip to content

Conversation

camilamacedo86
Copy link
Member

  • Add a test where the user changes the version in the Makefile to trigger a conflict
  • Check that both the user version and the new version appear in the conflict block
  • Make sure the update keeps user code and updates go modules correctly
  • Add clearer step messages using By() to make the test flow easier to follow
  • Improve check to verify if has markers conflicts

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 7, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86

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:

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 7, 2025
@camilamacedo86
Copy link
Member Author

c/c @vitorfloriano

- Add a test where the user changes the version in the Makefile to trigger a conflict
- Check that both the user version and the new version appear in the conflict block
- Make sure the update keeps user code and updates go modules correctly
- Add clearer step messages using By() to make the test flow easier to follow
- Improve check to verify if has markers conflicts
@camilamacedo86 camilamacedo86 force-pushed the improve-scearios-e2e-alpha-update branch from 01c938c to 4b1680f Compare August 7, 2025 09:24
@vitorfloriano
Copy link
Contributor

/lgtm

@k8s-ci-robot
Copy link
Contributor

@vitorfloriano: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@camilamacedo86 camilamacedo86 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 7, 2025
@k8s-ci-robot k8s-ci-robot merged commit 720feed into kubernetes-sigs:master Aug 7, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants