WINC-607: [e2e] Modularize BYOH configuration test #865

jrvaldes · 2022-01-13T15:25:30Z

This commit modularizes the testBYOHConfiguration test, so that
it is easy to maintain and can be extended. This is a pre-work
to introduce support for platform=none.

openshift-ci · 2022-01-13T15:25:31Z

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

jrvaldes · 2022-01-13T15:32:28Z

/test lint

jrvaldes · 2022-01-13T15:32:37Z

/test unit

jrvaldes · 2022-01-13T15:54:17Z

/test azure-e2e-operator

sebsoto · 2022-01-13T15:57:15Z

test/e2e/create_test.go

+}
+
+// configureBYOHWithMachineSets configures BYOH instances using MachineSets
+func (tc *testContext) configureBYOHWithMachineSets() error {


maybe rename this to something like newBYOHConfigMapFromMachineSet?

Not sure about that, do you anticipate newBYOHConfigMapFromMachineSet to return a reference of the windows-instances ConfigMap?

No, I'm just thinking that configureBYOHWithMachineSets doesn't really capture what the function is doing. The configuration of BYOH instances will be done by WMCO, this just enables it.

Alternatively maybe createBYOHConfigMapFromMachineSet?

Makes sense. Updated to provisionBYOHConfigMapWithMachineSet in 3f4f800 .
This function provisions the given number of BYOH instances and creates the windows-instances ConfigMap with the instances information.

PTAL

sebsoto · 2022-01-13T15:58:47Z

test/e2e/create_test.go

+	})
+}
+
+// configureBYOHWithMachineSets configures BYOH instances using MachineSets


This function will prevent Machine CSRs from being approved in the future, right?
Lets make sure thats captured in the function comment.

Makes sense.

Addressed in 26df7d8

jrvaldes · 2022-01-18T21:45:58Z

/test azure-e2e-operator

saifshaikh48 · 2022-01-20T16:41:29Z

test/e2e/create_test.go

+	return tc.createWindowsInstanceConfigMap(machines)
+}
+
+// disableClusterMachineApprover disables the Cluster Machine Approver, by scaling down Cluster Version Operator and


LGTM though this will probably need to be rebased once #873 merges.

This commit modularizes the testBYOHConfiguration test, so that it is easy to maintain and can be extended. This is a pre-work to introduce support for platform=none.

jrvaldes · 2022-01-21T02:27:36Z

Rebased with #873

jrvaldes · 2022-01-21T02:28:20Z

/test azure-e2e-operator

jrvaldes · 2022-01-21T02:28:29Z

/test lint

jrvaldes · 2022-01-21T02:28:36Z

/test unit

saifshaikh48

/lgtm

jrvaldes · 2022-02-10T17:58:15Z

@jrvaldes: #865 failed to apply on top of branch "release-4.8":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #909

jrvaldes · 2022-02-10T18:24:02Z

@jrvaldes: #865 failed to apply on top of branch "community-4.8":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #910

jrvaldes · 2022-02-16T18:49:35Z

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #908

/cherry-pick community-4.9

#908 has merge

openshift-cherrypick-robot · 2022-02-16T18:50:11Z

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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:

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #908

/cherry-pick community-4.9

#908 has merge

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.

jrvaldes · 2022-02-25T20:34:26Z

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #908

/cherry-pick community-4.9

#908 has merge

openshift-cherrypick-robot · 2022-02-25T20:35:03Z

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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:

@jrvaldes: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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".

Depends on #908

/cherry-pick community-4.9

#908 has merge

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.

mansikulkarni96 · 2022-03-01T20:16:23Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2022-03-01T20:16:59Z

@mansikulkarni96: #865 failed to apply on top of branch "release-4.8":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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.8

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.

mansikulkarni96 · 2022-03-02T04:24:08Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-03-02T04:24:45Z

@mansikulkarni96: #865 failed to apply on top of branch "release-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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.9

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.

mansikulkarni96 · 2022-03-02T14:31:45Z

/cherry-pick release-4.10

openshift-cherrypick-robot · 2022-03-02T14:32:27Z

@mansikulkarni96: #865 failed to apply on top of branch "release-4.10":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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.10

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.

mansikulkarni96 · 2022-03-02T14:34:55Z

/cherry-pick community-4.9

openshift-cherrypick-robot · 2022-03-02T14:35:30Z

@mansikulkarni96: #865 failed to apply on top of branch "community-4.9":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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 community-4.9

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.

mansikulkarni96 · 2022-03-03T19:47:56Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-03-03T19:48:35Z

@mansikulkarni96: new pull request created: #950

In response to this:

/cherry-pick release-4.9

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.

mansikulkarni96 · 2022-03-03T19:49:49Z

/cherry-pick community-4.9

openshift-cherrypick-robot · 2022-03-03T19:50:26Z

@mansikulkarni96: new pull request created: #951

In response to this:

/cherry-pick community-4.9

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 · 2022-03-08T04:56:47Z

@mansikulkarni96: #865 failed to apply on top of branch "release-4.8":

Applying: Modularize BYOH configuration test
Using index info to reconstruct a base tree...
M	test/e2e/create_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_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 Modularize BYOH configuration test
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.8

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.

mansikulkarni96 · 2022-03-08T14:59:44Z

/cherry-pick community-4.8

openshift-cherrypick-robot · 2022-03-08T15:00:23Z

@mansikulkarni96: new pull request created: #967

In response to this:

/cherry-pick community-4.8

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.

mansikulkarni96 · 2022-03-09T04:00:12Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2022-03-09T04:00:50Z

@mansikulkarni96: new pull request created: #969

In response to this:

/cherry-pick release-4.8

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-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 Jan 13, 2022

openshift-ci bot requested review from aravindhp and mansikulkarni96 January 13, 2022 15:26

sebsoto requested changes Jan 13, 2022

View reviewed changes

jrvaldes mentioned this pull request Jan 13, 2022

WINC-607: Add support for platform=none in e2e test suite #858

Merged

jrvaldes changed the title ~~[e2e] Modularize BYOH configuration test~~ WINC-607: [e2e] Modularize BYOH configuration test Jan 13, 2022

jrvaldes force-pushed the e2e-modularize-boyh-creation branch 2 times, most recently from 26df7d8 to 3f4f800 Compare January 18, 2022 21:43

jrvaldes requested a review from sebsoto January 18, 2022 21:46

saifshaikh48 reviewed Jan 20, 2022

View reviewed changes

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2022

[e2e] Modularize BYOH configuration test

a0a2243

This commit modularizes the testBYOHConfiguration test, so that it is easy to maintain and can be extended. This is a pre-work to introduce support for platform=none.

jrvaldes force-pushed the e2e-modularize-boyh-creation branch from 3f4f800 to a0a2243 Compare January 21, 2022 02:25

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2022

jrvaldes marked this pull request as ready for review January 21, 2022 03:04

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 21, 2022

saifshaikh48 reviewed Jan 21, 2022

View reviewed changes

openshift-ci bot assigned saifshaikh48 Jan 21, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2022

sebsoto approved these changes Jan 24, 2022

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2022

jrvaldes deleted the e2e-modularize-boyh-creation branch February 24, 2022 17:19

jrvaldes restored the e2e-modularize-boyh-creation branch February 25, 2022 19:17

openshift-cherrypick-robot mentioned this pull request Mar 3, 2022

[release-4.9] WINC-607: [e2e] Modularize BYOH configuration test #950

Merged

openshift-cherrypick-robot mentioned this pull request Mar 3, 2022

[community-4.9] WINC-607: [e2e] Modularize BYOH configuration test #951

Merged

openshift-cherrypick-robot mentioned this pull request Mar 8, 2022

[community-4.8] WINC-607: [e2e] Modularize BYOH configuration test #967

Merged

openshift-cherrypick-robot mentioned this pull request Mar 9, 2022

[release-4.8] WINC-607: [e2e] Modularize BYOH configuration test #969

Merged

jrvaldes deleted the e2e-modularize-boyh-creation branch March 17, 2022 20:06

WINC-607: [e2e] Modularize BYOH configuration test #865

WINC-607: [e2e] Modularize BYOH configuration test #865

Conversation

jrvaldes commented Jan 13, 2022

openshift-ci bot commented Jan 13, 2022

jrvaldes commented Jan 13, 2022

jrvaldes commented Jan 13, 2022

jrvaldes commented Jan 13, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes Jan 18, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jan 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jan 21, 2022

jrvaldes commented Jan 21, 2022

jrvaldes commented Jan 21, 2022

jrvaldes commented Jan 21, 2022

saifshaikh48 left a comment

Choose a reason for hiding this comment

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 16, 2022

openshift-cherrypick-robot commented Feb 16, 2022

jrvaldes commented Feb 25, 2022

openshift-cherrypick-robot commented Feb 25, 2022

mansikulkarni96 commented Mar 1, 2022

openshift-cherrypick-robot commented Mar 1, 2022

mansikulkarni96 commented Mar 2, 2022

openshift-cherrypick-robot commented Mar 2, 2022

mansikulkarni96 commented Mar 2, 2022

openshift-cherrypick-robot commented Mar 2, 2022

mansikulkarni96 commented Mar 2, 2022

openshift-cherrypick-robot commented Mar 2, 2022

mansikulkarni96 commented Mar 3, 2022

openshift-cherrypick-robot commented Mar 3, 2022

mansikulkarni96 commented Mar 3, 2022

openshift-cherrypick-robot commented Mar 3, 2022

openshift-cherrypick-robot commented Mar 8, 2022

mansikulkarni96 commented Mar 8, 2022

openshift-cherrypick-robot commented Mar 8, 2022

mansikulkarni96 commented Mar 9, 2022

openshift-cherrypick-robot commented Mar 9, 2022

jrvaldes Jan 18, 2022 •

edited