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

Skip bundles override for e2e-test when upgrade is from latest minor release. #8807

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

jhaanvi5
Copy link
Member

@jhaanvi5 jhaanvi5 commented Sep 23, 2024

Issue

UpgradeFromLatestMinorRelease tests fails with the template validation error, currently for these tests we use the staging bundle override to get the template which points to the latest release instead of getting the bundle from previous release.

Description of changes:

This PR adds a parameter to disable bundles Override for e2e-test when upgrade is from latest minor release, to get the correct bundle for the release.

Testing (if applicable):
./bin/e2e.test -test.v -test.run TestVSphereKubernetes127To128UbuntuUpgradeFromLatestMinorRelease

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 23, 2024
Copy link

codecov bot commented Sep 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.56%. Comparing base (bc3b6fc) to head (6e764f1).
Report is 31 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8807   +/-   ##
=======================================
  Coverage   73.55%   73.56%           
=======================================
  Files         578      578           
  Lines       36610    36610           
=======================================
+ Hits        26929    26931    +2     
+ Misses       7954     7953    -1     
+ Partials     1727     1726    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sp1999 sp1999 added this to the v0.21.0 milestone Oct 14, 2024
@abhay-krishna
Copy link
Member

/lgtm

@sp1999
Copy link
Member

sp1999 commented Oct 16, 2024

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sp1999

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

@sp1999
Copy link
Member

sp1999 commented Oct 17, 2024

/test eks-anywhere-e2e-presubmit

@eks-distro-bot eks-distro-bot merged commit e93b1ef into aws:main Oct 17, 2024
9 checks passed
@abhinavmpandey08
Copy link
Member

/cherry-pick release-0.20

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #8807 failed to apply on top of branch "release-0.20":

Applying: Skip bundles override for e2e-test when upgrade is from latest minor release
Using index info to reconstruct a base tree...
M	test/e2e/vsphere_test.go
M	test/framework/cloudstack.go
M	test/framework/nutanix.go
M	test/framework/vsphere.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/vsphere.go
Auto-merging test/framework/nutanix.go
Auto-merging test/framework/cloudstack.go
Auto-merging test/e2e/vsphere_test.go
CONFLICT (content): Merge conflict in test/e2e/vsphere_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Skip bundles override for e2e-test when upgrade is from latest minor release
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.20

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/test-infra repository.

@2ez4szliu
Copy link
Member

/cherry-pick release-0.19

@eks-distro-pr-bot
Copy link
Contributor

@2ez4szliu: #8807 failed to apply on top of branch "release-0.19":

Applying: Skip bundles override for e2e-test when upgrade is from latest minor release
Using index info to reconstruct a base tree...
M	test/e2e/vsphere_test.go
M	test/framework/cloudstack.go
M	test/framework/nutanix.go
M	test/framework/vsphere.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/vsphere.go
Auto-merging test/framework/nutanix.go
Auto-merging test/framework/cloudstack.go
Auto-merging test/e2e/vsphere_test.go
CONFLICT (content): Merge conflict in test/e2e/vsphere_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Skip bundles override for e2e-test when upgrade is from latest minor release
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.19

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/test-infra repository.

2ez4szliu added a commit to 2ez4szliu/eks-anywhere that referenced this pull request Oct 17, 2024
eks-distro-bot pushed a commit that referenced this pull request Oct 17, 2024
…m latest minor release (#8858)

Cherry-picked from #8807

Co-authored-by: Shizhao Liu <lshizhao@amazon.com>
jhaanvi5 added a commit to jhaanvi5/eks-anywhere that referenced this pull request Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants