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

jrvaldes · 2022-01-04T15:57:43Z

This PR adds support for the e2e tests to run in a platform-agnostic infrastructure (platform=none).

openshift-ci · 2022-01-04T15:57:45Z

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-04T15:57:57Z

/test unit

jrvaldes · 2022-01-04T15:58:05Z

/test lint

jrvaldes · 2022-01-04T16:08:30Z

Makefile

+.PHONY: run-ci-e2e-byoh-test $(ARGS)
+run-ci-e2e-byoh-test:
+	hack/run-ci-e2e-test.sh ${ARGS}
+
 .PHONY: clean


[windows-machine-config-operator]$ make run-ci-e2e-byoh-test ARGS="-t basic -m 0 -c 1" hack/run-ci-e2e-test.sh -t basic -m 0 -c 1 ARTIFACT_DIR is not set. Artifacts will be stored in: /tmp/tmp.FojjLu5RUr make[1]: Entering directory '/home/jvaldes/Projects/windows-machine-config-operator' go fmt ./... go vet ./... build/build.sh "build/_output" 5.0.0 -mod=vendor building windows-machine-config-operator... make[1]: Leaving directory '/home/jvaldes/Projects/windows-machine-config-operator' INFO[0000] Found annotations file bundle-dir=bundle container-tool=docker INFO[0000] Could not find optional dependencies file bundle-dir=bundle container-tool=docker INFO[0000] All validation tests have completed successfully Error from server (NotFound): namespaces "openshift-windows-machine-config-operator" not found namespace/openshift-windows-machine-config-operator created namespace/openshift-windows-machine-config-operator labeled INFO[0001] Creating windows-machine-config-operator registry INFO[0001] Creating ConfigMap "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-manifests-package" INFO[0001] Creating ConfigMap "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-manifests-5-0-0" INFO[0001] Creating Deployment "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" INFO[0001] Creating Service "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" INFO[0001] Waiting for Deployment "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" rollout to complete INFO[0002] Waiting for Deployment "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" to rollout: 0 out of 1 new replicas have been updated INFO[0013] Waiting for Deployment "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" to rollout: 0 of 1 updated replicas are available INFO[0023] Deployment "openshift-windows-machine-config-operator/windows-machine-config-operator-registry-server" successfully rolled out INFO[0023] Created CatalogSource: windows-machine-config-operator-catalog INFO[0023] OperatorGroup "operator-sdk-og" created INFO[0023] Created Subscription: windows-machine-config-operator-v5-0-0-sub INFO[0026] Approved InstallPlan install-w7fg8 for the Subscription: windows-machine-config-operator-v5-0-0-sub INFO[0026] Waiting for ClusterServiceVersion "openshift-windows-machine-config-operator/windows-machine-config-operator.v5.0.0" to reach 'Succeeded' phase INFO[0026] Waiting for ClusterServiceVersion "openshift-windows-machine-config-operator/windows-machine-config-operator.v5.0.0" to appear INFO[0028] Found ClusterServiceVersion "openshift-windows-machine-config-operator/windows-machine-config-operator.v5.0.0" phase: Pending INFO[0031] Found ClusterServiceVersion "openshift-windows-machine-config-operator/windows-machine-config-operator.v5.0.0" phase: Installing INFO[0042] Found ClusterServiceVersion "openshift-windows-machine-config-operator/windows-machine-config-operator.v5.0.0" phase: Succeeded INFO[0042] OLM has successfully installed "windows-machine-config-operator.v5.0.0" deployment "windows-machine-config-operator" successfully rolled out configmap/windows-instances created === RUN TestWMCO === RUN TestWMCO/operator_deployed_without_private_key_secret --- PASS: TestWMCO (1.32s) --- PASS: TestWMCO/operator_deployed_without_private_key_secret (0.42s) PASS ok github.com/openshift/windows-machine-config-operator/test/e2e 1.554s ? github.com/openshift/windows-machine-config-operator/test/e2e/clusterinfo [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/aws [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/azure [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/none [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/vsphere [no test files] === RUN TestWMCO === RUN TestWMCO/create === RUN TestWMCO/create/Creation === RUN TestWMCO/create/Creation/Windows_instance_configured_by_ConfigMap_controller 2022/01/03 20:19:43 waiting for 0/1 Windows nodes 2022/01/03 20:20:43 waiting for 0/1 Windows nodes 2022/01/03 20:21:43 waiting for 0/1 Windows nodes 2022/01/03 20:22:43 waiting for 0/1 Windows nodes 2022/01/03 20:23:43 waiting for 0/1 Windows nodes 2022/01/03 20:24:43 waiting for 0/1 Windows nodes 2022/01/03 20:25:43 waiting for 0/1 Windows nodes 2022/01/03 20:26:43 waiting for 0/1 Windows nodes 2022/01/03 20:27:43 waiting for 0/1 Windows nodes 2022/01/03 20:28:43 waiting for 0/1 Windows nodes 2022/01/03 20:29:43 waiting for 0/1 Windows nodes 2022/01/03 20:30:43 waiting for 0/1 Windows nodes 2022/01/03 20:31:43 waiting for 0/1 Windows nodes 2022/01/03 20:32:43 waiting for 0/1 Windows nodes 2022/01/03 20:33:43 waiting for 0/1 Windows nodes 2022/01/03 20:34:43 waiting for 0/1 Windows nodes 2022/01/03 20:35:43 waiting for 0/1 Windows nodes 2022/01/03 20:36:43 waiting for 0/1 Windows nodes 2022/01/03 20:37:43 waiting for 0/1 Windows nodes 2022/01/03 20:38:43 waiting for 0/1 Windows nodes 2022/01/03 20:39:43 waiting for 0/1 Windows nodes 2022/01/03 20:40:43 waiting for 0/1 Windows nodes 2022/01/03 20:41:43 waiting for 0/1 Windows nodes 2022/01/03 20:42:43 waiting for 0/1 Windows nodes 2022/01/03 20:43:43 waiting for 0/1 Windows nodes 2022/01/03 20:44:43 waiting for 0/1 Windows nodes 2022/01/03 20:45:43 waiting for 0/1 Windows nodes 2022/01/03 20:46:43 waiting for 0/1 Windows nodes 2022/01/03 20:47:43 waiting for 0/1 Windows nodes 2022/01/03 20:48:43 waiting for 0/1 Windows nodes 2022/01/03 20:48:43 waiting for 0/1 Windows nodes 2022/01/03 20:48:43 30m0.266048877s time is required to configure 1 nodes create_test.go:74: Error Trace: create_test.go:74 Error: Received unexpected error: timed out waiting for the condition Test: TestWMCO/create/Creation/Windows_instance_configured_by_ConfigMap_controller Messages: Windows node creation failed --- FAIL: TestWMCO (1817.31s) --- FAIL: TestWMCO/create (1816.45s) --- FAIL: TestWMCO/create/Creation (1816.45s) --- FAIL: TestWMCO/create/Creation/Windows_instance_configured_by_ConfigMap_controller (1800.27s) FAIL FAIL github.com/openshift/windows-machine-config-operator/test/e2e 1817.534s ? github.com/openshift/windows-machine-config-operator/test/e2e/clusterinfo [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/aws [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/azure [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/none [no test files] ? github.com/openshift/windows-machine-config-operator/test/e2e/providers/vsphere [no test files] FAIL make: *** [Makefile:188: run-ci-e2e-byoh-test] Error 1

While validating with a development platform=none UPI cluster, the e2e test suit creates the windows-instances configMap and supports platform=none as cloud provider. No Windows instances are getting created via machineSet generation.

WMCO was not able to provision the BYOH Windows instance as a Windows node due to CSR approval issues.

ERROR controller-runtime.manager.controller.certificatesigningrequest Reconciler error { "reconciler group": "certificates.k8s.io", "reconciler kind": "CertificateSigningRequest", "name": "csr-47vzn", "namespace": "", "error": "WMCO CSR Approver could not approve csr-47vzn CSR: could not validate contents for approval of CSR: csr-47vzn: error validating node name winhost for CSR: csr-47vzn: unable to map node name to the addresses of Windows instances: failed to lookup DNS for IP 192.168.20.13: lookup 13.20.168.192.in-addr.arpa. on 192.168.20.2:53: no such host", ... }

A PTR record must exist corresponding to the instance address (13.20.168.192 in this case) which resolves to the instance hostname for successful reverse DNS lookups.

mansikulkarni96

Thanks for working on this @jrvaldes
PTAL at my comments.

mansikulkarni96 · 2022-01-05T14:25:15Z

docs/HACKING.md

@@ -93,6 +93,23 @@ export OPENSHIFT_CI=false
 # on AWS only:
 export AWS_SHARED_CREDENTIALS_FILE=<path to aws credentials file>
 ```
+
+In addition, just for **BYOH** use case with **platform=none** UPI cluster export the `WINDOWS_INSTANCES_DATA` 


Shouldn't we explain how the instances will/should be brought up when running this scenario locally?

Makes sense, will adjust.

mansikulkarni96 · 2022-01-05T14:33:42Z

test/e2e/create_test.go

+	if testCtx.CloudProvider.GetType() == config.NonePlatformType {
+		// TODO: setPowerShellDefaultShell for given Windows instance(s)
+		// TODO: validate windows-instances configMap
+		t.Run("Windows instance configured by ConfigMap controller", func(t *testing.T) {


All BYOH nodes will be configured by configmap controller, how about a name that suggests this tests the BYOH configuration on platform none provider?

Sure, will include more context around "platform none provider".

test/e2e/providers/none/none.go

mansikulkarni96 · 2022-01-05T14:37:53Z

test/e2e/create_test.go

@@ -58,6 +58,22 @@ func testWindowsNodeCreation(t *testing.T) {
 	// Create a private key secret with the known private key.
 	require.NoError(t, testCtx.createPrivateKeySecret(true), "could not create known private key secret")

+	//  Machine API Operator is not available in a platform=none UPI cluster. Hence, cannot use machineSets to create


Not sure we need to add this comment, the reason we cannot use machine sets is cloud provider is none in this setup.

jrvaldes · 2022-01-07T06:06:27Z

/test unit

jrvaldes · 2022-01-07T06:06:34Z

/test lint

saifshaikh48 · 2022-01-07T14:38:56Z

docs/HACKING.md

+data:
+  10.1.42.1: |-
+    username=Administrator


Better to have 2 instances in the example? Just so the "more complex" case is documented for users

I'd rather keep a simple example here, the "more complex" ones are listed in the above-mentioned/referenced windows-instances configMap documentation.

saifshaikh48 · 2022-01-07T14:47:37Z

test/e2e/create_test.go

+		// TODO: setPowerShellDefaultShell for given Windows instance(s)
+		// TODO: validate windows-instances configMap


Nice TODOs. I suggest flipping their order when implementing them however (fail faster).

Are you planning to address the TODOs here or in a follow up PR?

No longer need them, I re-worked this based on Sebastian's comment.

saifshaikh48 · 2022-01-07T14:53:36Z

docs/HACKING.md

+### Running e2e tests on platform-agnostic infrastructure
+
+To run the WMCO' e2e tests on a bare metal or other platform-agnostic infrastructure (platform=none), where there
+is no cloud provider specification, the desired number of Windows instances must be available beforehand, and you


s/available/provisioned/g

sebsoto · 2022-01-07T14:56:19Z

test/e2e/create_test.go

+	if testCtx.CloudProvider.GetType() == config.NonePlatformType {
+		// TODO: setPowerShellDefaultShell for given Windows instance(s)
+		// TODO: validate windows-instances configMap
+		t.Run("[platform=none] Windows instance configured by ConfigMap controller", func(t *testing.T) {
+			err = testCtx.waitForWindowsNodes(gc.numberOfBYOHNodes, false, false, true)
+			assert.NoError(t, err, "Windows node creation failed")
+		})
+		// Expected number of Windows instances configured as worker nodes, return
+		return
+	}


I'm hesitant about creating another branching path based on another if testCtx.CloudProvider.GetType() ==, this code really belongs as part of the ConfigMap controller test.

An alternative way for you to approach this, is to expand the Provider interface to include a new method such as NewBYOHConfigMap(instanceCount).

For existing providers (AWS,Azure etc.) this method could call a shared function which encapsulates the logic currently within the BYOH tests used to create the VMs and the windows-instances configmap.

windows-machine-config-operator/test/e2e/create_test.go

Lines 129 to 149 in bb5f6d4

func (tc *testContext) testBYOHConfiguration(t *testing.T) {

if gc.numberOfBYOHNodes == 0 {

t.Skip("BYOH testing disabled")

}

// Patch the CVO with overrides spec value for cluster-machine-approver deployment

// Doing so, stops CVO from creating/updating its deployment hereafter.

patchData := `[{"op":"add","path":"/spec/overrides","value":[{"kind":"Deployment","group":"apps","name":"machine-approver","namespace":"openshift-cluster-machine-approver","unmanaged":true}]}]`

_, err := tc.client.Config.ConfigV1().ClusterVersions().Patch(context.TODO(), "version", types.JSONPatchType, []byte(patchData), metav1.PatchOptions{})

// Scale the Cluster Machine Approver Deployment to 0

// This is required for testing BYOH CSR approval feature so that BYOH instances

// CSR's are not approved by Cluster Machine Approver

expectedPodCount := int32(0)

err = tc.scaleMachineApproverDeployment(&expectedPodCount)

require.NoError(t, err, "failed to scale Machine Approver pods")

_, err = tc.createWindowsMachineSet(gc.numberOfBYOHNodes, false)

require.NoError(t, err, "failed to create Windows MachineSet")

machines, err := tc.waitForWindowsMachines(int(gc.numberOfBYOHNodes), "Provisioned", false)

require.NoError(t, err, "Machines did not reach expected state")

Then for the new PlatformNone provider you are adding, you can either move the logic you added in the hack script into the go code, or you can assume it was created ahead of time and do a check to ensure the ConfigMap exists, with the correct amount of Windows instances listed

That way within the ConfigMap controller test, what can be done is:

require.NoError(t,testCtx.CloudProvider.NewBYOHConfigMap(gc.numberOfBYOHNodes)) err = tc.waitForWindowsNodes(gc.numberOfBYOHNodes, false, false, true) assert.NoError(t, err, "Windows node creation failed")

Doing things this way helps smooth out the flow of our tests, and also helps us expand provider specific requirements in the future.

@sebsoto Thanks for the feedback. This is good. Will adjust.

Opened #865 to partially address this comment. WINC-608 is a blocker to fully decouple BYOH from MachineSets, making the creation of the BYOH instances cloud provider-specific.

aravindhp

Thanks for working on this, @jrvaldes. Please address my comments.

aravindhp · 2022-01-07T17:32:20Z

Makefile

+.PHONY: run-ci-e2e-byoh-test $(ARGS)
+run-ci-e2e-byoh-test:
+	hack/run-ci-e2e-test.sh ${ARGS}


I would rather have this explicit now instead of using $(ARGS). Once you have introduced the new single target with $(ARGS), you can collapse all the existing endpoints. The reason for this is that we will eventually get rid of run-ci-e2e-byoh-test and there is little advantage in doing this here.

That was my initial implementation too, the main driver for using a parameter here is:

the windows instance must be provisioned before invoking the test

the test is invoked with arguments ($ARGS) right after $WINDOWS_INSTANCES_DATA is set as env var.

$WINDOWS_INSTANCES_DATA and $ARGS must be aligned, given $ARGS contains the number of entries in $WINDOWS_INSTANCES_DATA

make run-ci-e2e-byoh-test ARGS="-t basic -m 0 -c 1"

So, having both definitions in the same place is safer.

I don't follow your reasoning here. Why can't you use the $WINDOWS_INSTANCES_DATA in the call here then without having to use $(ARGS)?

So, having both definitions in the same place is safer.

I don't understand what you mean by this.

By same place meant the commands in the release repo.

You are right, will adjust to only pass WINDOWS_INSTANCES_DATA and parse the number of instances programmatically in the e2e code.

That is not what I mean. We should just have a make run-ci-e2e-byoh-test in the release repo without any args. This is what we have been doing in the past mainly because we want to reduce the interaction we have with the release repo. With the pattern you are introducing anytime we want to change the way we are calling the test we have to go to the release repo instead of the WMCO repo. IOW, don't introduce $(ARGS).

I follow, by

only pass WINDOWS_INSTANCES_DATA

I meant, pass WINDOWS_INSTANCES_DATA as an environment variable.

The Makefile target has no arguments, and the test can be configured and invoked using the same pattern from a release job and/or running locally. For example:

export WINDOWS_INSTANCES_DATA make run-ci-e2e-test

So, no need to introduce the proposed run-ci-e2e-byoh-test target at all.

hack/run-ci-e2e-test.sh will look after $WINDOWS_INSTANCES_DATA and create the ConfigMap with the provided data if any. At this point, syntax validation is deferred to oc apply API.

WMCO e2e test must be smart enough, to process an existing windows-instances ConfigMap and adjust accordingly. i.e. do not create BOYH instances on platform-agnostic infrastructure and use the provided ones, if any.

aravindhp · 2022-01-07T17:34:14Z

hack/run-ci-e2e-test.sh

@@ -11,6 +11,9 @@ BYOH_NODE_COUNT_OPTION=""
 SKIP_NODE_DELETION=""
 WMCO_PATH_OPTION=""

+# WINDOWS_INSTANCES_DATA holds the windows-instances configMap data section
+declare -r WINDOWS_INSTANCES_DATA=${WINDOWS_INSTANCES_DATA:-}


Why do you need to use declare given we have not be doing this before? I under stand the weak typesetting this allows but I don't see the advantage and would like us to be consistent.

Using declare to ensure $WINDOWS_INSTANCES_DATA is read-only (-r) as a constant. Before the usage aligns more as variables.

There are many other variable where this applies to. I don't see this as being reason enough to introduce this.

aravindhp · 2022-01-07T17:36:52Z

hack/run-ci-e2e-test.sh

@@ -101,6 +104,22 @@ if ! [[ "$OPENSHIFT_CI" = "true" &&  "$TEST" = "upgrade" ]]; then
  done
 fi

+# Check windows-instances data and create the windows-instances configMap, if


ConfigMap. Please fix everywhere.

aravindhp · 2022-01-07T17:39:26Z

test/e2e/create_test.go

@@ -58,6 +58,18 @@ func testWindowsNodeCreation(t *testing.T) {
 	// Create a private key secret with the known private key.
 	require.NoError(t, testCtx.createPrivateKeySecret(true), "could not create known private key secret")

+	// in case platform=none is detected just wait for Windows worker node to become available


For platform=none, just wait...

aravindhp · 2022-01-07T17:39:52Z

test/e2e/create_test.go

+		// TODO: setPowerShellDefaultShell for given Windows instance(s)
+		// TODO: validate windows-instances configMap


Are you planning to address the TODOs here or in a follow up PR?

aravindhp · 2022-01-07T17:40:56Z

test/e2e/create_test.go

+	if testCtx.CloudProvider.GetType() == config.NonePlatformType {
+		// TODO: setPowerShellDefaultShell for given Windows instance(s)
+		// TODO: validate windows-instances configMap
+		t.Run("[platform=none] Windows instance configured by ConfigMap controller", func(t *testing.T) {
+			err = testCtx.waitForWindowsNodes(gc.numberOfBYOHNodes, false, false, true)
+			assert.NoError(t, err, "Windows node creation failed")
+		})
+		// Expected number of Windows instances configured as worker nodes, return
+		return
+	}


aravindhp · 2022-01-07T17:42:58Z

docs/HACKING.md

@@ -117,6 +117,40 @@ hack/run-ci-e2e-test.sh -s -m 2 -c 1
 ```
 Please note that you do not need to run `hack/olm.sh run` before `hack/run-ci-e2e-test.sh`.

+### Running e2e tests on platform-agnostic infrastructure


#### as this is sub section under Running e2e tests on a cluster. Cluster includes platform=none.

aravindhp · 2022-01-07T17:43:15Z

docs/HACKING.md

+
+To run the WMCO' e2e tests on a bare metal or other platform-agnostic infrastructure (platform=none), where there
+is no cloud provider specification, the desired number of Windows instances must be available beforehand, and you
+need provide the instance(s) information to the e2e test suite using an environment variable.


need to provide the instance(s) information to the e2e test suite using the WINDOWS_INSTANCES_DATA environment variable

aravindhp · 2022-01-07T17:45:51Z

docs/HACKING.md

+- the internal IP address, and
+- the Windows administrator username
+
+Export `WINDOWS_INSTANCES_DATA` as an environment variable with the corresponding [windows-instances configMap](https://github.com/openshift/windows-machine-config-operator#adding-instances)


ConfigMap. Please fix everywhere.

aravindhp · 2022-01-07T17:47:27Z

docs/HACKING.md

+accounts for the number of instances that will be configured by the ConfigMap controller, and must match the
+number of entries in the `WINDOWS_INSTANCES_DATA` environment variable, in this example only one (1).


This needs to be caught programmatically.

Agree, plan to address this under the above comment's umbrella.

jrvaldes · 2022-01-18T22:15:53Z

/hold

Depends on #865

rvanderp3 · 2022-01-18T22:31:24Z

docs/vsphere_ci/platform-none/README.md

+vSphere CI (`vmc-ci.devcluster.openshift.com`) uses AWS Route53 for DNS
+resolution and the following ci-segments are reserved for platform=none clusters
+- ci-segment-56
+- ci-segment-47


I think you meant ci-segment-57

Good catch. Addressed in 79db264

jrvaldes · 2022-01-24T23:39:16Z

/test lint

jrvaldes · 2022-01-24T23:39:24Z

/test unit

jrvaldes · 2022-01-24T23:41:09Z

/test vsphere-e2e-operator

jrvaldes · 2022-02-10T15:54:36Z

/cherry-pick release-4.10

jrvaldes · 2022-02-10T15:54:49Z

/cherry-pick community-4.9

jrvaldes · 2022-02-10T15:54:58Z

/cherry-pick release-4.9

jrvaldes · 2022-02-10T15:55:06Z

/cherry-pick community-4.8

jrvaldes · 2022-02-10T15:55:13Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2022-02-10T15:55:16Z

@jrvaldes: new pull request created: #901

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.

openshift-cherrypick-robot · 2022-02-10T15:55:25Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	hack/run-ci-e2e-test.sh
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging hack/run-ci-e2e-test.sh
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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.

openshift-cherrypick-robot · 2022-02-10T15:55:34Z

@jrvaldes: #858 failed to apply on top of branch "release-4.9":

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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.

openshift-cherrypick-robot · 2022-02-10T15:55:42Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	hack/run-ci-e2e-test.sh
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging hack/run-ci-e2e-test.sh
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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.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-cherrypick-robot · 2022-02-10T15:55:49Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	hack/run-ci-e2e-test.sh
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging hack/run-ci-e2e-test.sh
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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.

aravindhp · 2022-02-10T17:16:37Z

@jrvaldes this needs to be backported only to releases where we support platform:none.

jrvaldes · 2022-02-10T17:34:43Z

@jrvaldes this needs to be backported only to releases where we support platform:none.

From Cluster and OS Pre-Requisites, Platform none (BYOH) support starts at 4.8+.

aravindhp · 2022-02-10T17:50:40Z

@jrvaldes this needs to be backported only to releases where we support platform:none.

From Cluster and OS Pre-Requisites, Platform none (BYOH) support starts at 4.8+.

My bad. I am mixing up releases. Sorry for the noise.

jrvaldes · 2022-02-26T01:20:04Z

/cherry-pick community-4.9

openshift-cherrypick-robot · 2022-02-26T01:20:40Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	hack/run-ci-e2e-test.sh
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging hack/run-ci-e2e-test.sh
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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-01T19:32:45Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-03-01T19:33:23Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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-02T04:22:59Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-03-02T04:23:36Z

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

Applying: Add support for platform=none
Using index info to reconstruct a base tree...
M	Makefile
M	test/e2e/create_test.go
M	test/e2e/providers/cloudprovider.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/providers/cloudprovider.go
Auto-merging test/e2e/create_test.go
CONFLICT (content): Merge conflict in test/e2e/create_test.go
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for platform=none
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-03T22:03:31Z

/cherry-pick community-4.9

openshift-cherrypick-robot · 2022-03-03T22:04:20Z

@mansikulkarni96: new pull request created: #955

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

openshift-ci bot requested review from mansikulkarni96 and sebsoto January 4, 2022 15:58

jrvaldes commented Jan 4, 2022

View reviewed changes

mansikulkarni96 reviewed Jan 5, 2022

View reviewed changes

jrvaldes force-pushed the WINC-607 branch 3 times, most recently from 29a59ce to 2e46e27 Compare January 7, 2022 05:32

jrvaldes changed the title ~~WINC-607: [e2e] Add support for platform=none~~ WINC-607: Add support for platform=none in e2e test suite Jan 7, 2022

jrvaldes requested a review from mansikulkarni96 January 7, 2022 05:36

jrvaldes mentioned this pull request Jan 7, 2022

WINC-607: [upi-vsphere] Add support for Windows VM in platform=none workflow openshift/release#24911

Merged

saifshaikh48 reviewed Jan 7, 2022

View reviewed changes

sebsoto reviewed Jan 7, 2022

View reviewed changes

aravindhp suggested changes Jan 7, 2022

View reviewed changes

jrvaldes force-pushed the WINC-607 branch 2 times, most recently from 8d6e56f to 3897898 Compare January 11, 2022 14:06

jrvaldes force-pushed the WINC-607 branch from 3897898 to 9d859bb Compare January 18, 2022 22:14

rvanderp3 reviewed Jan 18, 2022

View reviewed changes

jrvaldes force-pushed the WINC-607 branch 3 times, most recently from 38c3c57 to 70babf6 Compare January 24, 2022 23:38

openshift-cherrypick-robot mentioned this pull request Feb 10, 2022

[release-4.10] WINC-607: Add support for platform=none in e2e test suite #901

Merged

This was referenced Feb 24, 2022

WINC-607: Add support for platform=none in e2e test suite (Cont.) #896

Merged

WINC-607: Require platform=none job in 4.9 presubmits openshift/release#26592

Merged

WINC-607: Require platform=none job in 4.8 presubmits openshift/release#26593

Merged

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

[community-4.9] WINC-607: Add support for platform=none in e2e test suite #955

Closed

		// TODO: setPowerShellDefaultShell for given Windows instance(s)
		// TODO: validate windows-instances configMap

	func (tc testContext) testBYOHConfiguration(t testing.T) {
	if gc.numberOfBYOHNodes == 0 {
	t.Skip("BYOH testing disabled")
	}

	// Patch the CVO with overrides spec value for cluster-machine-approver deployment
	// Doing so, stops CVO from creating/updating its deployment hereafter.
	patchData := `[{"op":"add","path":"/spec/overrides","value":[{"kind":"Deployment","group":"apps","name":"machine-approver","namespace":"openshift-cluster-machine-approver","unmanaged":true}]}]`
	_, err := tc.client.Config.ConfigV1().ClusterVersions().Patch(context.TODO(), "version", types.JSONPatchType, []byte(patchData), metav1.PatchOptions{})

	// Scale the Cluster Machine Approver Deployment to 0
	// This is required for testing BYOH CSR approval feature so that BYOH instances
	// CSR's are not approved by Cluster Machine Approver
	expectedPodCount := int32(0)
	err = tc.scaleMachineApproverDeployment(&expectedPodCount)
	require.NoError(t, err, "failed to scale Machine Approver pods")

	_, err = tc.createWindowsMachineSet(gc.numberOfBYOHNodes, false)
	require.NoError(t, err, "failed to create Windows MachineSet")
	machines, err := tc.waitForWindowsMachines(int(gc.numberOfBYOHNodes), "Provisioned", false)
	require.NoError(t, err, "Machines did not reach expected state")

		accounts for the number of instances that will be configured by the ConfigMap controller, and must match the
		number of entries in the `WINDOWS_INSTANCES_DATA` environment variable, in this example only one (1).

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

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

Conversation

jrvaldes commented Jan 4, 2022 • edited

openshift-ci bot commented Jan 4, 2022

jrvaldes commented Jan 4, 2022

jrvaldes commented Jan 4, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mansikulkarni96 left a comment

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jan 7, 2022

jrvaldes commented Jan 7, 2022

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sebsoto Jan 7, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes Jan 13, 2022 • edited

Choose a reason for hiding this comment

aravindhp left a comment

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes Jan 10, 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

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jan 18, 2022 • edited

rvanderp3 Jan 18, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jan 24, 2022

jrvaldes commented Jan 24, 2022

jrvaldes commented Jan 24, 2022

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

openshift-cherrypick-robot commented Feb 10, 2022

openshift-cherrypick-robot commented Feb 10, 2022

openshift-cherrypick-robot commented Feb 10, 2022

openshift-cherrypick-robot commented Feb 10, 2022

openshift-cherrypick-robot commented Feb 10, 2022

aravindhp commented Feb 10, 2022

jrvaldes commented Feb 10, 2022

aravindhp commented Feb 10, 2022

jrvaldes commented Feb 26, 2022

openshift-cherrypick-robot commented Feb 26, 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 3, 2022

openshift-cherrypick-robot commented Mar 3, 2022

jrvaldes commented Jan 4, 2022 •

edited

sebsoto Jan 7, 2022 •

edited

jrvaldes Jan 13, 2022 •

edited

jrvaldes Jan 10, 2022 •

edited

jrvaldes commented Jan 18, 2022 •

edited

rvanderp3 Jan 18, 2022 •

edited