TRT-2068: add renames for tests coming from o/k based on the removal of annotations

[smg247]

No description provided.

[openshift-ci-robot]

@smg247: This pull request references TRT-2068 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.20.0" version, but no target version was set.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

[smg247]

/hold

[stbenjam]

It doesn't surprise me mapping.json didn't get updated if we haven't seen the new names in the wild yet.

We need to keep [Suite:openshift/conformance/serial] [Suite:k8s] in the names right now, because origin is still using these. We'll have to implement the Suites via CEL exprs to be able to get rid of these (card in the epic for it).

So we could either add those back in, or wait until we get the suites card done

[smg247]

It sounds like either way we do it we will have to keep the annotation logic in o/k until after suites are implemented and used in origin. Am I understanding that correctly? If that is the case, it makes more sense to do that first rather than remove parts of the annotation logic, but keep others.

[stbenjam]

It sounds like either way we do it we will have to keep the annotation logic in o/k until after suites are implemented and used in origin. Am I understanding that correctly?

Not necessarily, you could remove all the annotation code except for this:

https://github.com/openshift/kubernetes/blob/18f7f4cbd6eaf8621dceeb1b0c1738487f547396/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go#L110-L113

And keep the simple logic for serial/parallel determination, and always append [Suite:k8s].

[smg247]

@stbenjam, I updated the mapping to take into account that the suite info will not be removed from the test names (for now). There are now a few changes when make mapping is run. I think this is due to tests that have at one point been skipped/disabled, but no longer are.

I am going to make a corresponding change to o/k after this to delete all annotation rules that don't pertain to suites, but I first have to wait for openshift/kubernetes#2296 to merge.

This PR can/should merge prior to my forthcoming o/k change anyways.

Edit: openshift/kubernetes#2299 will be ready to merge after this one goes in

[smg247]

/hold cancel

[stbenjam]

This looks good to me

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smg247, stbenjam

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:

• OWNERS [stbenjam]

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