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

[ARO-13400] Old E2E pipeline uses MiWi clusters #4056

Merged
merged 21 commits into from
Mar 10, 2025
Merged

Conversation

mrWinston
Copy link
Collaborator

Which issue this PR addresses:

Fixes ARO-6153
Fixes ARO-13400
Fixes ARO-6196

What this PR does / why we need it:

This PR is the amalgamation of most miwi e2e efforts from @bitoku and Me. Roughly speaking, it implements the following:

  • Support miwi cluster creation in hack/cluster/cluster.go
  • Modify old e2e pipeline to create and test a miwi cluster
  • Fix E2E test failures that came up after running miwi e2e tests the first time

After this PR is merged, it is possible to run e2e tests against a miwi cluster on a PR by triggering the old pipeline with this comment:

/azp run e2e

Copy link
Contributor

@hlipsig hlipsig left a comment

Choose a reason for hiding this comment

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

I noticed several new libraries being imported some of which are not in fully supported states. Do we already use these libraries elsewhere? Do we know the history behind these selections?

@@ -601,6 +605,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a library we're already using?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I added viper as a dependency to help managing the different envioronment variables as a config struct ( see ClusterConfig definition and viper usage in NewClusterConfigFromEnv)

All the addiitonal dependencies are pulled in as dependencies of viper itself.

Copy link
Collaborator

@cadenmarchese cadenmarchese left a comment

Choose a reason for hiding this comment

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

I left some comments on the pipeline / bash components here. Thanks for your efforts!

@rajdeepc2792
Copy link
Collaborator

Just to confirm, this PR merge won't be impacting the Prod release pipeline, or in other words will the MIWI e2e cluster creation will run as part of Prod release pipeline? We don't want it to be running in the Prod until the preview API endpoints are available there.

@github-actions github-actions bot added the needs-rebase branch needs a rebase label Jan 28, 2025
Copy link

Please rebase pull request.

@mrWinston
Copy link
Collaborator Author

mrWinston commented Jan 29, 2025

@rajdeepc2792

Just to confirm, this PR merge won't be impacting the Prod release pipeline, or in other words will the MIWI e2e cluster creation will run as part of Prod release pipeline?

This PR shouldn't have an impact on the prod pipeline. Using a miwi cluster for the E2E tests needs to be explicitly enabled in the pipeline.

@github-actions github-actions bot removed the needs-rebase branch needs a rebase label Jan 30, 2025
@github-actions github-actions bot added the needs-rebase branch needs a rebase label Feb 27, 2025
Copy link

Please rebase pull request.

@github-actions github-actions bot removed the needs-rebase branch needs a rebase label Mar 4, 2025
@mrWinston
Copy link
Collaborator Author

/azp run e2e

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mrWinston mrWinston requested review from hlipsig and kimorris27 March 4, 2025 13:27
Copy link
Contributor

@kimorris27 kimorris27 left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for the hard work on this over a long period of time! I will defer to @cadenmarchese for official approval and merge.

@kimorris27 kimorris27 dismissed their stale review March 4, 2025 22:03

Dismissing my old request for changes (not sure why my re-review just now was not sufficient)

@github-actions github-actions bot added the needs-rebase branch needs a rebase label Mar 7, 2025
Copy link

github-actions bot commented Mar 7, 2025

Please rebase pull request.

@github-actions github-actions bot removed the needs-rebase branch needs a rebase label Mar 7, 2025
@cadenmarchese
Copy link
Collaborator

/azp run ci, e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@mrWinston
Copy link
Collaborator Author

Build error should now be fixed, i made a small error when merging the master branch. Restarting the pipelines now.

@mrWinston
Copy link
Collaborator Author

/azp run ci, e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

Copy link
Collaborator

@cadenmarchese cadenmarchese left a comment

Choose a reason for hiding this comment

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

thank you for all your efforts here :)

@cadenmarchese cadenmarchese dismissed hlipsig’s stale review March 10, 2025 14:22

Concerns around importing were answered

@cadenmarchese cadenmarchese merged commit 1915349 into master Mar 10, 2025
22 checks passed
tsatam added a commit that referenced this pull request Mar 11, 2025
scottd018 pushed a commit to scottd018/ARO-RP that referenced this pull request Mar 12, 2025
* E2E tests with miwi clusters

* go fmt

* Update pkg/util/cluster/cluster.go

Co-authored-by: Kipp Morris <[email protected]>

* remove unneccessary comments

* Update pkg/util/cluster/cluster.go

Co-authored-by: Kipp Morris <[email protected]>

* rename

* don't create an app when miwi is enabled

* remove early exit from checkAccessv2

* comment fixing

* make sure create_miwi_env_file behaviour stays the same in dev env

* uppercase env vars in cluster_config

* fix formatting, see what renaming does to a pipe

* revert renaming e2e.yml

* use object id for mock msi role assignment

* fix build error

* formatting

---------

Co-authored-by: Ayato Tokubi <[email protected]>
Co-authored-by: Kipp Morris <[email protected]>
s-fairchild pushed a commit that referenced this pull request Mar 19, 2025
* E2E tests with miwi clusters

* go fmt

* Update pkg/util/cluster/cluster.go

Co-authored-by: Kipp Morris <[email protected]>

* remove unneccessary comments

* Update pkg/util/cluster/cluster.go

Co-authored-by: Kipp Morris <[email protected]>

* rename

* don't create an app when miwi is enabled

* remove early exit from checkAccessv2

* comment fixing

* make sure create_miwi_env_file behaviour stays the same in dev env

* uppercase env vars in cluster_config

* fix formatting, see what renaming does to a pipe

* revert renaming e2e.yml

* use object id for mock msi role assignment

* fix build error

* formatting

---------

Co-authored-by: Ayato Tokubi <[email protected]>
Co-authored-by: Kipp Morris <[email protected]>
slawande2 added a commit that referenced this pull request Mar 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants