USHIFT-704: skip [sig-cli] whoami result with console for MicroShift #28005

chiragkyal · 2023-06-27T15:06:16Z

This change will skip
"[sig-cli] oc basics can show correct whoami result with console [Skipped:NoOptionalCapabilities] [Suite:openshift/conformance/parallel]"
test by adding NoOptionalCapabilities for MicroShift

openshift-ci-robot · 2023-06-27T15:06:19Z

@chiragkyal: This pull request references USHIFT-704 which is a valid jira issue.

In response to this:

This change will skip
"[sig-cli] oc basics can show correct whoami result with console [Skipped:NoOptionalCapabilities] [Suite:openshift/conformance/parallel]"
test if openshift-config-managed namespace is not present. This namespace holds console-public configmap having consoleURL.

For MicroShiftopenshift-config-managed namespace is not present, so this test can be skipped.

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 · 2023-06-27T15:06:49Z

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

dhellmann · 2023-06-27T17:46:24Z

test/extended/cli/basics.go

@@ -250,6 +250,11 @@ var _ = g.Describe("[sig-cli] oc basics", func() {
 	})

 	g.It("can show correct whoami result with console", func() {
+		nsExist, err := exutil.IsNamespaceExist(oc, "openshift-config-managed")


How is that namespace related to this test? Is that where the console runs? Or does the whoami command use information from that namespace?

whoami command use information from that namespace.

It looks for console-public configmap present inside that namespace, to extract consoleURL. It's defined here and here. We don't have this namespace in MicroShift.

The console is an optional component now. What does whoami do if the namespace exists but the console URL is empty? Maybe there's a bug in whoami for this more extreme case where the console URL cannot be determined?

it only is an issue if the "--show-console" arg is specified. If you specify that arg when you don't have the console enabled, you'll get an error but that should not be surprising.

https://github.com/openshift/oc/blob/c078876cc5aa434a02f14c28b8c2a56b9011aa13/pkg/cli/whoami/whoami.go#L149-L150

https://github.com/openshift/oc/blob/c078876cc5aa434a02f14c28b8c2a56b9011aa13/pkg/cli/whoami/whoami.go#L121-L136

i feel like we had to deal w/ this for the "nocaps" e2e job, but since this test doesn't seem to contain any logic to check for which caps are enabled, i'm not sure how we ended up doing that.

118d288 adds this test to a set annotated with [Skipped:NoOptionalCapabilities]. In test/extended/util/annotate/rules.go that maps to requires-optional-cap, which is left out of no optional capabilities in the test case list defined in TestDecodeProvider. That entry has platform set to GCE, though, and MicroShift runs the tests with provider none.

Can we do something else in the setup before running the tests for MicroShift to indicate that all capabilities are disabled and that no optional capabilities configuration should be used? Do we need another entry in the list in TestDecodeProvider for MicroShift?

Do we need another entry in the list in TestDecodeProvider for MicroShift?

No, that's just a test case for ensuring we detect/decode clusters correctly (so that we can pick the right set of tests). I think you need to update the cluster discovery logic to recognize a "microshift" cluster and set the EnabledCapabilities accordingly:

origin/cmd/openshift-tests/provider.go

Line 78 in 5c4887a

func decodeProvider(provider string, dryRun, discover bool, clusterState *exutilcluster.ClusterState) (*exutilcluster.ClusterConfiguration, error) {

origin/test/extended/util/cluster/cluster.go

Lines 149 to 153 in 5c4887a

clusterVersion, err := configClient.ConfigV1().ClusterVersions().Get(context.Background(), "version", metav1.GetOptions{})

if err != nil {

return nil, err

}

state.OptionalCapabilities = clusterVersion.Status.Capabilities.EnabledCapabilities

I've updated the decodeProvider logic to recognize a "microshift" cluster and set config.HasNoOptionalCapabilities = true. However, the [Skipped:NoOptionalCapabilities] annotation doesn't seem to be getting enabled for this test. Any suggestions that I may be missing here?

chiragkyal · 2023-06-30T11:27:48Z

/retest

bparees · 2023-07-06T15:13:59Z

cmd/openshift-tests/provider.go

+		}
+		if isMicroShift {
+			config.HasNoOptionalCapabilities = true
+		}


are you sure you're ending on up in the "Default" provider case when running against a microshift cluster?

should be easy enough to run locally w/ some debug statements and see what's actually happening when the detection logic runs

No, it should be inside "none" case. There was something wrong with my MicroShift cluster which leads all debug statements to go inside "Default" case.

I've added it now in "none" case.

bparees · 2023-07-06T15:17:04Z

cmd/openshift-tests/provider.go

+		if err != nil {
+			return nil, err
+		}
+		isMicroShift, err := exutil.IsMicroShiftCluster(coreClient)


I would do this in "DiscoverClusterState" and not "decodeProvider".

The provider is irrelevant

Most of the cluster state logic checks inside "DiscoverClusterState" are not applicable for MicroShift. For example:

infrastructures.config.openshift.io networks.operator.openshift.io clusterversion

If we conditionally try to skip the above checks based on IsMicroShiftCluster() in "DiscoverClusterState", then I think, we also need to update "LoadConfig()", which would be called after "DiscoverClusterState".

/cc @pacevedom

yeah ok, since we don't call DiscoverClusterState in the case of provider==none, it's not a good fit.

Agree with Ben, even though the name might be misleading because its more discovery than decoding.

bparees · 2023-07-10T13:29:10Z

lgtm, is there a microshift job we can run this PR against?

chiragkyal · 2023-07-10T13:33:23Z

lgtm, is there a microshift job we can run this PR against?

Not yet. Currently, one by one we are fixing the tests which are failing in MicroShift. Ultimately, our target is to have a working job, passing all the tests.

test/extended/util/framework.go

bparees · 2023-07-10T17:11:00Z

/approve

dhellmann · 2023-07-10T17:36:49Z

/lgtm

openshift-ci · 2023-07-10T17:37:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, chiragkyal, dhellmann

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:

~~cmd/OWNERS~~ [bparees]
~~test/OWNERS~~ [bparees]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2023-07-10T18:31:19Z

/retest-required

Remaining retests: 0 against base HEAD 98e2f3f and 2 for PR HEAD 4a72ef7 in total

chiragkyal · 2023-07-11T02:43:10Z

/retest-required

openshift-ci-robot · 2023-07-11T08:31:13Z

/retest-required

Remaining retests: 0 against base HEAD a60975f and 1 for PR HEAD 4a72ef7 in total

chiragkyal · 2023-07-11T13:48:39Z

/retest-required

openshift-ci-robot · 2023-07-11T16:04:36Z

/retest-required

Remaining retests: 0 against base HEAD 158f668 and 0 for PR HEAD 4a72ef7 in total

openshift-ci-robot · 2023-07-11T19:55:40Z

/hold

Revision 4a72ef7 was retested 3 times: holding

chiragkyal · 2023-07-12T06:29:20Z

/unhold
/retest

openshift-ci-robot · 2023-07-12T07:58:08Z

/retest-required

Remaining retests: 0 against base HEAD 158f668 and 2 for PR HEAD 4a72ef7 in total

chiragkyal · 2023-07-12T12:15:52Z

/retest-required

chiragkyal · 2023-07-12T13:53:32Z

/retest-required

openshift-ci-robot · 2023-07-13T13:28:40Z

/retest-required

Remaining retests: 0 against base HEAD a02345e and 1 for PR HEAD 4a72ef7 in total

openshift-ci-robot · 2023-07-14T14:18:40Z

/retest-required

Remaining retests: 0 against base HEAD f352e7c and 0 for PR HEAD 4a72ef7 in total

openshift-ci-robot · 2023-07-14T16:18:37Z

/hold

Revision 4a72ef7 was retested 3 times: holding

chiragkyal · 2023-07-17T03:38:52Z

/unhold
/retest-required

openshift-ci-robot · 2023-07-17T08:18:28Z

/retest-required

Remaining retests: 0 against base HEAD 9609ce2 and 2 for PR HEAD 4a72ef7 in total

openshift-ci-robot · 2023-07-17T13:03:21Z

/retest-required

Remaining retests: 0 against base HEAD f907888 and 1 for PR HEAD 4a72ef7 in total

chiragkyal · 2023-07-17T14:10:11Z

/retest-required

openshift-ci-robot · 2023-07-18T05:03:08Z

/retest-required

Remaining retests: 0 against base HEAD c945bb9 and 0 for PR HEAD 4a72ef7 in total

openshift-ci-robot · 2023-07-18T06:03:04Z

/hold

Revision 4a72ef7 was retested 3 times: holding

chiragkyal · 2023-07-18T06:04:20Z

/unhold
/retest-required

openshift-ci-robot · 2023-07-18T08:44:16Z

/retest-required

Remaining retests: 0 against base HEAD c945bb9 and 2 for PR HEAD 4a72ef7 in total

chiragkyal · 2023-07-18T13:53:08Z

/retest-required

openshift-ci · 2023-07-18T15:43:05Z

@chiragkyal: 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-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 27, 2023

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 Jun 27, 2023

chiragkyal force-pushed the USHIFT-704-console branch from 05f4633 to 0d68217 Compare June 27, 2023 15:13

dhellmann reviewed Jun 27, 2023

View reviewed changes

chiragkyal marked this pull request as ready for review June 28, 2023 10:30

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 Jun 28, 2023

openshift-ci bot requested review from bparees and mfojtik June 28, 2023 10:32

openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 29, 2023

chiragkyal force-pushed the USHIFT-704-console branch from a56ec6e to a36c1c2 Compare July 6, 2023 13:07

bparees reviewed Jul 6, 2023

View reviewed changes

chiragkyal force-pushed the USHIFT-704-console branch from a36c1c2 to a57105d Compare July 10, 2023 11:09

openshift-ci bot requested a review from pacevedom July 10, 2023 12:15

bparees reviewed Jul 10, 2023

View reviewed changes

test/extended/util/framework.go Show resolved Hide resolved

add NoOptionalCapabilities for MicroShift

4a72ef7

chiragkyal force-pushed the USHIFT-704-console branch from a57105d to 4a72ef7 Compare July 10, 2023 14:50

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2023

openshift-ci bot assigned dhellmann Jul 10, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 11, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 12, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 17, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2023

openshift-merge-robot merged commit 7ed0335 into openshift:master Jul 18, 2023
23 checks passed

chiragkyal deleted the USHIFT-704-console branch July 18, 2023 17:28

	clusterVersion, err := configClient.ConfigV1().ClusterVersions().Get(context.Background(), "version", metav1.GetOptions{})
	if err != nil {
	return nil, err
	}
	state.OptionalCapabilities = clusterVersion.Status.Capabilities.EnabledCapabilities

USHIFT-704: skip [sig-cli] whoami result with console for MicroShift #28005

USHIFT-704: skip [sig-cli] whoami result with console for MicroShift #28005

Conversation

chiragkyal commented Jun 27, 2023 • edited

openshift-ci-robot commented Jun 27, 2023 • edited by openshift-ci bot

openshift-ci bot commented Jun 27, 2023

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

chiragkyal commented Jun 30, 2023

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

bparees commented Jul 10, 2023

chiragkyal commented Jul 10, 2023

bparees commented Jul 10, 2023

dhellmann commented Jul 10, 2023

openshift-ci bot commented Jul 10, 2023

openshift-ci-robot commented Jul 10, 2023

chiragkyal commented Jul 11, 2023

openshift-ci-robot commented Jul 11, 2023

chiragkyal commented Jul 11, 2023

openshift-ci-robot commented Jul 11, 2023

openshift-ci-robot commented Jul 11, 2023

chiragkyal commented Jul 12, 2023

openshift-ci-robot commented Jul 12, 2023

chiragkyal commented Jul 12, 2023

chiragkyal commented Jul 12, 2023

openshift-ci-robot commented Jul 13, 2023

openshift-ci-robot commented Jul 14, 2023

openshift-ci-robot commented Jul 14, 2023

chiragkyal commented Jul 17, 2023

openshift-ci-robot commented Jul 17, 2023

openshift-ci-robot commented Jul 17, 2023

chiragkyal commented Jul 17, 2023

openshift-ci-robot commented Jul 18, 2023

openshift-ci-robot commented Jul 18, 2023

chiragkyal commented Jul 18, 2023

openshift-ci-robot commented Jul 18, 2023

chiragkyal commented Jul 18, 2023

openshift-ci bot commented Jul 18, 2023

chiragkyal commented Jun 27, 2023 •

edited

openshift-ci-robot commented Jun 27, 2023 •

edited by openshift-ci bot