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.

Sign up for GitHub

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

Jump to bottom

WINC-956: Reduce direct use of the AWS API in e2e tests #1365

Merged
merged 2 commits into from Jan 10, 2023
Merged

WINC-956: Reduce direct use of the AWS API in e2e tests #1365

merged 2 commits into from Jan 10, 2023

Conversation

sebsoto
Copy link
Contributor

@sebsoto sebsoto commented Dec 15, 2022 •
edited

This PR brings the AWS provider in line with the rest of the providers, by using an existing worker MachineSet as a base for the Windows MachineSet created in our e2e tests. This removes complexity related to dealing with the AWS CLI, simplifying the provider code, and reducing the potential of test failure due to AWS API rate limiting issues that can infrequently occur.

The only remaining API call is DescribeImages, which is required as the use of the MachineAPI for AWS requires a specific imageID be provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 15, 2022
@sebsoto
Copy link
Contributor Author

sebsoto commented Dec 15, 2022

/test aws-e2e-operator

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@sebsoto
Copy link
Contributor Author

sebsoto commented Dec 15, 2022

/test aws-e2e-upgrade

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2022
@sebsoto sebsoto changed the title Remove direct use of the AWS API Remove direct use of the AWS API in e2e tests Dec 15, 2022
@sebsoto
Copy link
Contributor Author

sebsoto commented Dec 15, 2022

/approve cancel

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2022
@mtnbikenc
Copy link
Member

@sebsoto Thanks for working on this. It looks like throttling on AWS disproportionately affects WMCO PRs.

@sebsoto sebsoto changed the title Remove direct use of the AWS API in e2e tests Reduce direct use of the AWS API in e2e tests Jan 3, 2023
@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 3, 2023

/test aws-e2e-operator

@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 3, 2023

/test aws-e2e-upgrade

aravindhp
aravindhp approved these changes Jan 3, 2023
View reviewed changes
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for doing this, @sebsoto

test/e2e/providers/aws/aws.go Outdated Show resolved Hide resolved
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2023
@sebsoto
[test] Reduce AWS API calls
91fa17d 
This commit brings the AWS provider in line with the rest of the
providers, by using an existing worker MachineSet as a base for the
Windows MachineSet created in our e2e tests. This removes complexity
related to dealing with the AWS CLI, simplifying the provider code, and
reducing the potential of test failure due to AWS API rate limiting
issues that can infrequently occur.

The only remaining API call is DescribeImages, which is required as the
use of the MachineAPI for AWS requires a specific imageID be provided.
@sebsoto
[vendor] Remove unused AWS dependencies
95eb2ca 
`go mod tidy && go mod vendor`
@sebsoto sebsoto changed the title Reduce direct use of the AWS API in e2e tests WINC-956: Reduce direct use of the AWS API in e2e tests Jan 3, 2023
@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 3, 2023

/make lint

@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 3, 2023

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link

@sebsoto: once the present PR merges, I will cherry-pick it on top of release-4.12 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.12

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.

@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 3, 2023

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link

@sebsoto: once the present PR merges, I will cherry-pick it on top of release-4.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.11

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.

@alinaryan
Copy link
Contributor

Thanks for working on this,
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2023
@sebsoto sebsoto marked this pull request as ready for review January 3, 2023 20:20
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 3, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 7a89722 and 2 for PR HEAD 95eb2ca in total

@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 4, 2023

/retest-required

1 similar comment
@aravindhp
Copy link
Contributor

/retest-required

@aravindhp
Copy link
Contributor

/retest-required

Timed out waiting for the catalog source oo-zdxqb to become ready after 10 minutes.

@sebsoto
Copy link
Contributor Author

sebsoto commented Jan 7, 2023

/test aws-e2e-upgrade

@aravindhp
Copy link
Contributor

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2023

@sebsoto: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 156c598 into openshift:master Jan 10, 2023
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 10, 2023
Merged
@openshift-cherrypick-robot
Copy link

@sebsoto: new pull request created: #1374

In response to this:

/cherry-pick release-4.12

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.

@openshift-cherrypick-robot
Copy link

@sebsoto: #1365 failed to apply on top of branch "release-4.11":

Applying: Reduce AWS API calls
Using index info to reconstruct a base tree...
M	test/e2e/providers/aws/aws.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/aws/aws.go
CONFLICT (content): Merge conflict in test/e2e/providers/aws/aws.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 Reduce AWS API calls
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-4.11

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aravindhp aravindhp Awaiting requested review from aravindhp

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

Assignees

@alinaryan alinaryan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sebsoto @mtnbikenc @openshift-cherrypick-robot @alinaryan @openshift-ci-robot @aravindhp @openshift-merge-robot