Merge branch 'openshift:main' into censor_bearertoken

Author: alokgoswami-ag

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.20
+  tag: rhel-9-release-golang-1.24-openshift-4.21

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,3 @@
+# Disables from the UI, and forces people to read the alternatives for GH issues
+# Issues are still reportable from the API, which is needed for ci automation
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,15 @@
+---
+name: 🚫 Do not file issues here
+about: This repository does not use GitHub Issues
+title: ""
+---
+
+# 🚫 Please do not file issues here
+
+This repository does **not** use GitHub Issues for tracking bugs, requests, or questions.
+
+👉 Instead, please use one of the following:
+- 📨 [forum-ocp-release-oversight](https://redhat.enterprise.slack.com/archives/C01CQA76KMX) - for Red Hat internal `Origin` support
+- 🐞 [OCPBUGS Jira](https://issues.redhat.com/projects/OCPBUGS) - for bug reports (including with the test framework)
+- 🧰 [Red Hat Customer Support](https://access.redhat.com/) — for any product-related help, support cases, or enterprise assistance
+Thank you for your understanding!

.github/ISSUE_TEMPLATE/do_not_file.md

@@ -37,34 +37,29 @@ will switch to vendoring origin-specific branches (e.g
 carries that need to be considered in the context of
 `openshift/kubernetes` rebases.
 
-### Test annotation rules
+### Test exclusion rules
 
-Test annotation rules are used to label e2e tests so that they can be
-filtered or skipped. For example, rules can be defined that match kube
-e2e tests that are known to be incompatible with openshift and label
-those tests to be skipped.
+Test exclusion is now handled through environmental selector based filtering
+rather than test annotations. Environmental selectors allow tests to be
+filtered or skipped based on the cluster environment and configuration.
+For example, selectors can be defined that match kube e2e tests that are
+known to be incompatible with specific OpenShift configurations and exclude
+those tests from running.
 
-Maintenance of test annotation rules is split between the
+Maintenance of test exclusion rules is split between the
 `openshift/kubernetes` and `origin` repos to ensure that PRs proposed
 to `openshift/kubernetes` can be validated against the set of kube e2e
-tests known to be compatible with openshift.
+tests known to be compatible with OpenShift.
 
-Test annotation rules for kubernetes e2e tests are maintained in:
+Test exclusion rules for kubernetes e2e tests are maintained in: https://github.com/openshift/kubernetes/blob/master/openshift-hack/cmd/k8s-tests-ext:
+* [environment_selectors.go](https://github.com/openshift/kubernetes/blob/master/openshift-hack/cmd/k8s-tests-ext/environment_selectors.go)
+* [disabled_tests.go](https://github.com/openshift/kubernetes/blob/master/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go)
 
-https://github.com/openshift/kubernetes/blob/master/openshift-hack/e2e/annotate/rules.go
+Test exclusion rules for openshift e2e tests are maintained in: https://github.com/openshift/origin/blob/main/pkg/test/extensions:
+* [environment_selectors.go](https://github.com/openshift/origin/blob/main/pkg/test/extensions/environment_selectors.go)
+* [disabled_tests.go](https://github.com/openshift/origin/blob/main/pkg/test/extensions/disabled_tests.go)
 
-Test annotation rules for openshift e2e tests are maintained in:
-
-https://github.com/openshift/origin/blob/main/test/extended/util/annotate/rules.go
-
-Origin vendors the kube rules and applies both the kube and openshift
-rules to the set of tests included in the `openshift-tests` binary.
-
-In order to update test annotation rules for kube e2e tests, it will
-be necessary to:
-
- - Update `rules.go` in `openshift/kubernetes`
- - Bump the version of `openshift/kubernetes` vendored in origin
+To update test exclusion rules for kube e2e tests, update the environmental selectors in `openshift/kubernetes`. For OpenShift e2e tests, update the selectors in `origin`.
 
 ### Vendoring from `openshift/kubernetes`
 

README.md

@@ -28,7 +28,6 @@ import (
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/monitor"
 	run_monitor "github.com/openshift/origin/pkg/cmd/openshift-tests/monitor/run"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/monitor/timeline"
-	"github.com/openshift/origin/pkg/cmd/openshift-tests/render"
 	risk_analysis "github.com/openshift/origin/pkg/cmd/openshift-tests/risk-analysis"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/run"
 	run_disruption "github.com/openshift/origin/pkg/cmd/openshift-tests/run-disruption"
@@ -106,7 +105,6 @@ func main() {
 		timeline.NewTimelineCommand(ioStreams),
 		run_disruption.NewRunInClusterDisruptionMonitorCommand(ioStreams),
 		collectdiskcertificates.NewRunCollectDiskCertificatesCommand(ioStreams),
-		render.NewRenderCommand(ioStreams),
 		versioncmd.NewVersionCommand(ioStreams),
 	)